Storage integration tests improvements

README.md

@@ -51,13 +51,13 @@ Modify the root `package.json` and change volta section to use node version 16.2
 
 ```sh
 # Build local npm packages
-yarn build:packages
+yarn build
 
 # Build joystream/node docker testing image
 RUNTIME_PROFILE=TESTING yarn build:node:docker
 
 # Start a local development network
-RUNTIME_PROFILE=TESTING yarn start
+yarn start
 ```
 
 ## Software
@@ -111,13 +111,13 @@ Look under the 'Assets' section:
 
 ```bash
 # Make sure yarn packages are built
-yarn build:packages
+yarn build
 
 # Build the test joystream-node
 RUNTIME_PROFILE=TESTING yarn build:node:docker
 
 # Run tests
-./tests/network-tests/run-full-tests.sh
+yarn test
 ```
 
 ### Contributing

package.json

@@ -6,8 +6,10 @@
   "scripts": {
     "build:node:docker": "./build-node-docker.sh",
     "build:packages": "./build-packages.sh",
+    "build": "yarn build:packages",
     "setup": "./setup.sh",
     "start": "./start.sh",
+    "test": "./tests/network-tests/run-tests.sh",
     "cargo-checks": "./scripts/cargo-checks.sh",
     "cargo-build": "./scripts/cargo-build.sh",
     "lint": "./scripts/lint-typescript.sh",

query-node/README.md

@@ -70,13 +70,13 @@ GRAPHQL_PLAYGROUND_CDN="query/server" yarn workspace query-node-root query-node:
 Run integration tests
 
 ```
-./query-node/run-tests.sh
+./tests/network-tests/run-tests.sh
 ```
 
-To run tests and keep services alive for further inspection, set `DEBUG` shell variable to any true-ish value.
+To run tests and keep services alive for further inspection, set `PERSIST` shell variable to any true-ish value.
 
 ```
-DEBUG=true ./query-node/run-tests.sh
+PERSIST=true ./tests/network-tests/run-tests.sh
 ```
 
 You can then use queries manually in GraphQL Playground (http://localhost:8081/graphql),
@@ -87,8 +87,9 @@ This assumes the scenario is repeatable and any previous test errors didn't brea
 the blockchain or processor state in a critical way.
 
 ```
-DEBUG=true ./query-node/run-tests.sh # run tests first and make sure services stay alive
-REUSE_KEYS=true yarn workspace network-tests run-test-scenario content-directory
+# run tests first and make sure services stay alive
+PERSIST=true ./tests/network-tests/run-tests.sh
+yarn workspace network-tests run-test-scenario content-directory
 ```
 
 Commenting out some of the scenario's flow calls in `network-tests/src/scenarios/content-directory.ts` is not relevant to the current

query-node/start.sh

@@ -19,6 +19,10 @@ docker-compose -f ../docker-compose.yml up -d hydra-indexer-gateway
 # Start processor
 docker-compose -f ../docker-compose.yml up -d processor
 echo "Waiting for processor to be ready..." && sleep 30
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    # On Docker Desktop things take a bit longer to startup
+    sleep 150
+fi
 
 # Start graphql-server
 docker-compose -f ../docker-compose.yml up -d graphql-server

start-multistorage.sh

@@ -1,7 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
+SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
+cd $SCRIPT_PATH
+
+rm tests/network-tests/keys.json || :
+
 # Run a complete joystream development network on your machine using docker
+export RUNTIME_PROFILE=${RUNTIME_PROFILE:=TESTING}
 export JOYSTREAM_NODE_TAG=${JOYSTREAM_NODE_TAG:=$(./scripts/runtime-code-shasum.sh)}
 
 INIT_CHAIN_SCENARIO=${INIT_CHAIN_SCENARIO:=setupNewChainMultiStorage}
@@ -29,7 +35,7 @@ fi
 ./query-node/start.sh
 
 ## Orion
-./start-orion.sh
+# ./start-orion.sh
 
 ## Init the chain with some state
 if [[ $SKIP_CHAIN_SETUP != 'true' ]]; then
@@ -42,7 +48,7 @@ if [[ $SKIP_CHAIN_SETUP != 'true' ]]; then
   ./tests/network-tests/run-test-scenario.sh ${INIT_CHAIN_SCENARIO}
 
   ## Member faucet
-  export INVITER_KEY=$(cat ./tests/network-tests/output.json | jq -r .faucet.suri)
+  export INVITER_KEY=$(cat ./tests/network-tests/keys.json | jq -r .faucet.suri)
   docker-compose up -d faucet
 
   ## Storage Infrastructure Nodes

start.sh

@@ -1,7 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
+SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
+cd $SCRIPT_PATH
+
+rm tests/network-tests/keys.json || :
+
 # Run a complete joystream development network on your machine using docker
+export RUNTIME_PROFILE=${RUNTIME_PROFILE:=TESTING}
 export JOYSTREAM_NODE_TAG=${JOYSTREAM_NODE_TAG:=$(./scripts/runtime-code-shasum.sh)}
 
 INIT_CHAIN_SCENARIO=${INIT_CHAIN_SCENARIO:=setupNewChain}
@@ -29,7 +35,7 @@ fi
 ./query-node/start.sh
 
 ## Orion
-./start-orion.sh
+# ./start-orion.sh
 
 ## Init the chain with some state
 if [[ $SKIP_CHAIN_SETUP != 'true' ]]; then
@@ -40,7 +46,7 @@ if [[ $SKIP_CHAIN_SETUP != 'true' ]]; then
   ./tests/network-tests/run-test-scenario.sh ${INIT_CHAIN_SCENARIO}
 
   ## Member faucet
-  export INVITER_KEY=$(cat ./tests/network-tests/output.json | jq -r .faucet.suri)
+  export INVITER_KEY=$(cat ./tests/network-tests/keys.json | jq -r .faucet.suri)
   docker-compose up -d faucet
 
   ## Storage Infrastructure Nodes

tests/network-tests/.gitignore

@@ -1,3 +1,4 @@
 output.json
 data/
 **/generated/*
+keys.json

tests/network-tests/.prettierignore

@@ -2,3 +2,4 @@
 .tmp/
 data/
 output.json
+keys.json

tests/network-tests/package.json

@@ -6,6 +6,7 @@
     "build": "yarn generate:all && tsc --noEmit",
     "test": "./run-tests.sh",
     "run-test-scenario": "./run-test-scenario.sh",
+    "run-flow": "./run-fow.sh",
     "node-ts-strict": "node -r ts-node/register --unhandled-rejections=strict",
     "lint": "eslint . --quiet --ext .ts",
     "checks": "tsc --noEmit --pretty && prettier ./ --check && yarn lint",

tests/network-tests/run-flow.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
+cd $SCRIPT_PATH
+
+# Execute the flow scenario
+time DEBUG=integration-tests:* yarn workspace network-tests \
+    node-ts-strict src/scenarios/flow.ts $1

tests/network-tests/run-node-docker.sh

@@ -4,6 +4,8 @@ set -e
 SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
 cd $SCRIPT_PATH
 
+rm ./keys.json || :
+
 # Log only to stderr
 # Only output from this script should be the container id of the node at the very end
 

tests/network-tests/run-runtime-upgrade-tests.sh

@@ -4,6 +4,8 @@ set -e
 SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
 cd $SCRIPT_PATH
 
+rm ./keys.json || :
+
 # Log only to stderr
 # Only output from this script should be the container id of the node at the very end
 
@@ -187,8 +189,6 @@ function main {
     # 6. Bootstrap storage infra because we need to run content-directory tests after runtime upgrade
     if [ "${NO_STORAGE}" != true ]; then
         ./start-storage.sh
-        export REUSE_KEYS=true
-        export SKIP_STORAGE_AND_DISTRIBUTION=true
     fi
 
     ./run-test-scenario.sh runtimeUpgrade

tests/network-tests/run-test-node.sh

@@ -4,6 +4,8 @@ set -e
 SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
 cd $SCRIPT_PATH
 
+rm ./keys.json || :
+
 # Location used to store chain data, generated spec file and initial members
 # and balances for the test chain.
 DATA_PATH=./data

tests/network-tests/run-test-scenario.sh

@@ -7,7 +7,8 @@ cd $SCRIPT_PATH
 # pass the scenario name without .ts extension
 SCENARIO=$1
 # fallback if scenario not specified
-SCENARIO=${SCENARIO:="content-directory"}
+SCENARIO=${SCENARIO:="full"}
 
-# Execute the tests
-time DEBUG=integration-tests:* yarn workspace network-tests node-ts-strict src/scenarios/${SCENARIO}.ts
+# Execute the scenario and optional arguments after following scenario name
+time DEBUG=integration-tests:* yarn workspace network-tests \
+    node-ts-strict src/scenarios/${SCENARIO}.ts $2 $3 $4 $5