feat!: drop legacy storage (#1117)

Author: benjlevesque

.circleci/config.yml

@@ -96,7 +96,6 @@ jobs:
       - run:
           name: Generate Payment Detection queries
           command: yarn workspace @requestnetwork/payment-detection run codegen
-
       - run:
           name: Build all packages (tsc)
           command: yarn build:tsc
@@ -372,6 +371,8 @@ jobs:
       - *node_image
       - *ipfs_image
       - *ganache_image
+      - *postgres_image
+      - *graph_image
     working_directory: *working_directory
     steps:
       - attach_workspace:
@@ -382,6 +383,7 @@ jobs:
       - run:
           name: 'Deploy test contract from smart-contracts'
           command: 'yarn workspace @requestnetwork/smart-contracts run deploy'
+      - run: *step_graph_deploy
       - run:
           name: 'Start request-node'
           command: 'yarn workspace @requestnetwork/request-node run start'
@@ -393,44 +395,6 @@ jobs:
       - run:
           name: 'Test integration-test (layers)'
           command: 'yarn workspace @requestnetwork/integration-test run test:layers --ci --maxWorkers=1'
-  # This test runs the node-client tests against a node backed by TheGraph data access
-  test-integration-graph-node:
-    docker:
-      - *node_image
-      - *ipfs_image
-      - *ganache_image
-      - *postgres_image
-      - *graph_image
-    working_directory: *working_directory
-    steps:
-      - attach_workspace:
-          at: *working_directory
-      - run:
-          name: 'Build integration-test'
-          command: 'yarn workspace @requestnetwork/integration-test run build'
-      - run:
-          name: 'Deploy test contract from smart-contracts'
-          command: 'yarn workspace @requestnetwork/smart-contracts run deploy'
-      - run: *step_graph_deploy
-      - run:
-          name: 'Start request-node'
-          command: 'yarn workspace @requestnetwork/request-node run start'
-          background: true
-          environment:
-            GRAPH_NODE_URL: http://localhost:8000/subgraphs/name/RequestNetwork/request-storage
-      - run: *step_wait_for_node
-      - run:
-          name: 'Confirm TheGraph mode'
-          command: |
-            NODE_ENDPOINT=$(wget -O- http://localhost:3000/status | jq .dataAccess.endpoint -r)
-            if [  "$NODE_ENDPOINT" != "http://localhost:8000/subgraphs/name/RequestNetwork/request-storage" ] ; then
-              print "Graph node URL mismatch"
-              print $NODE_ENDPOINT
-              exit 1
-            fi
-      - run:
-          name: 'Test integration-test'
-          command: 'yarn workspace @requestnetwork/integration-test run test:node'
   test-usage-examples:
     docker:
       - *node_image
@@ -528,6 +492,8 @@ jobs:
       - *node_image
       - *ipfs_image
       - *ganache_image
+      - *postgres_image
+      - *graph_image
     working_directory: *working_directory
     steps:
       - attach_workspace:
@@ -538,20 +504,12 @@ jobs:
       - run:
           name: 'Deploy test contract from smart-contracts'
           command: 'yarn workspace @requestnetwork/smart-contracts run deploy'
+      - run: *step_graph_deploy
       - run:
           name: 'Start request-node'
           command: 'yarn workspace @requestnetwork/request-node run start'
           background: true
-      - run:
-          name: Waiting for Request Node to be ready
-          command: |
-            for i in `seq 1 10`;
-            do
-              curl -s -o /dev/null -f http://localhost:3000/readyz > /dev/null && echo Success && exit 0
-              echo -n .
-              sleep 1
-            done
-            echo Failed waiting for Node initialization && exit 1
+      - run: *step_wait_for_node
       - run:
           name: 'Test integration-test (erc20)'
           command: 'yarn workspace @requestnetwork/integration-test run test:erc20 --ci --maxWorkers=1'
@@ -659,9 +617,6 @@ workflows:
       - test-integration-test:
           requires:
             - build
-      - test-integration-graph-node:
-          requires:
-            - build
       - test-payment-detection:
           requires:
             - build
@@ -699,7 +654,6 @@ workflows:
             - test-epk-signature
             - test-ethereum-storage
             - test-integration-test
-            - test-integration-graph-node
             - test-smart-contracts
             - test-multi-format
             - test-request-client

README.md

@@ -41,12 +41,11 @@ Join the [Request Discord][request-discord-url] to get in touch with us.
 
 ### Private Packages
 
-| Package                                                                | Description                                                 |
-| ---------------------------------------------------------------------- | ----------------------------------------------------------- |
-| [`@requestnetwork/integration-test`](/packages/integration-test)       | Integration test for the Request system                     |
-| [`@requestnetwork/prototype-estimator`](/packages/prototype-estimator) | Give estimates of size and throughput of the Request system |
-| [`@requestnetwork/toolbox`](/packages/toolbox)                         | Toolbox for Request Network                                 |
-| [`@requestnetwork/usage-example`](/packages/usage-example)             | Usage examples of Request Network                           |
+| Package                                                          | Description                             |
+| ---------------------------------------------------------------- | --------------------------------------- |
+| [`@requestnetwork/integration-test`](/packages/integration-test) | Integration test for the Request system |
+| [`@requestnetwork/toolbox`](/packages/toolbox)                   | Toolbox for Request Network             |
+| [`@requestnetwork/usage-example`](/packages/usage-example)       | Usage examples of Request Network       |
 
 ## Contributing
 

packages/advanced-logic/package.json

@@ -42,13 +42,11 @@
     "@requestnetwork/currency": "0.10.0",
     "@requestnetwork/types": "0.37.0",
     "@requestnetwork/utils": "0.37.0",
-    "@types/node": "16.11.7",
-    "lodash": "4.17.21",
     "tslib": "2.5.0"
   },
   "devDependencies": {
     "@types/jest": "26.0.13",
-    "@types/lodash": "4.14.161",
+    "@types/node": "16.11.7",
     "jest": "26.4.2",
     "nyc": "15.1.0",
     "shx": "0.3.2",

packages/data-access/package.json

@@ -42,14 +42,10 @@
     "@requestnetwork/multi-format": "0.15.11",
     "@requestnetwork/types": "0.37.0",
     "@requestnetwork/utils": "0.37.0",
-    "bluebird": "3.7.2",
-    "keyv": "4.0.3",
     "tslib": "2.5.0"
   },
   "devDependencies": {
-    "@types/bluebird": "3.5.33",
     "@types/jest": "26.0.13",
-    "@types/keyv": "3.1.1",
     "@types/node": "16.11.7",
     "jest": "26.4.2",
     "nyc": "15.1.0",

packages/data-access/src/combined-data-access.ts

@@ -39,6 +39,4 @@ export abstract class CombinedDataAccess implements DataAccessTypes.IDataAccess
     channelId: string,
     topics?: string[] | undefined,
   ) => Promise<DataAccessTypes.IReturnPersistTransaction>;
-
-  abstract _getStatus(): Promise<any>;
 }