From 9bff339f74750587cf8f57cc95dd294e75d12290 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Mon, 30 May 2022 22:15:04 +0400 Subject: [PATCH 01/20] chore: move platform test suite faucet persistent storage to the parent directory --- .dockerignore | 1 + .gitignore | 1 + packages/platform-test-suite/lib/test/createFaucetClient.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index d74bb7d8c89..e70fe1c3aec 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,6 +4,7 @@ .nyc_output logs +db scripts node_modules diff --git a/.gitignore b/.gitignore index 2e1c50046ed..db78dbdf7f6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ node_modules *.log +db/* # Ultra runner build cache .ultra.cache.json diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index b15c59ab143..1a58201e9f7 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -5,7 +5,7 @@ let storageAdapter; if (typeof window === 'undefined') { // eslint-disable-next-line global-require const { NodeForage } = require('nodeforage'); - storageAdapter = new NodeForage({ name: `faucet-wallet-${process.env.FAUCET_ADDRESS}` }); + storageAdapter = new NodeForage({ name: `../../db/faucet-wallet-${process.env.FAUCET_ADDRESS}` }); } else { // eslint-disable-next-line global-require storageAdapter = require('localforage'); From c0c12d367b4b803694ef0a66cafa05466c8ba89e Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 7 Jun 2022 11:45:38 +0400 Subject: [PATCH 02/20] fix: gitignore --- .gitignore | 1 - db/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 db/.gitignore diff --git a/.gitignore b/.gitignore index db78dbdf7f6..2e1c50046ed 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ node_modules *.log -db/* # Ultra runner build cache .ultra.cache.json diff --git a/db/.gitignore b/db/.gitignore new file mode 100644 index 00000000000..d6b7ef32c84 --- /dev/null +++ b/db/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From cd034f40f0f25b75c76402fbe1ca8edc3f1d2839 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Wed, 8 Jun 2022 00:49:39 +0400 Subject: [PATCH 03/20] feat: move faucet storage into env var and add argument in test.sh --- packages/platform-test-suite/bin/test.sh | 7 ++++++ .../lib/test/createClientWithFundedWallet.js | 2 +- .../lib/test/createFaucetClient.js | 25 +++++++++---------- scripts/configure_test_suite.sh | 1 + 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/packages/platform-test-suite/bin/test.sh b/packages/platform-test-suite/bin/test.sh index 55cd89ca928..23fee39b20e 100755 --- a/packages/platform-test-suite/bin/test.sh +++ b/packages/platform-test-suite/bin/test.sh @@ -78,6 +78,8 @@ case ${i} in ;; -t=*|--timeout=*) timeout="${i#*=}" + --faucet-storage-dir=*) + faucet_storage_dir="${i#*=}" ;; esac done @@ -187,6 +189,11 @@ then cmd="${cmd} DPNS_TOP_LEVEL_IDENTITY_PRIVATE_KEY=${identity_private_key}" fi +if [ -n "$faucet_storage_dir" ] +then + cmd="${cmd} FAUCET_STORAGE_DIR=${faucet_storage_dir}" +fi + if [ -n "$GITHUB_ACTIONS" ] then cmd="${cmd} NODE_ENV=test node_modules/.bin/mocha -b ${scope_dirs}" diff --git a/packages/platform-test-suite/lib/test/createClientWithFundedWallet.js b/packages/platform-test-suite/lib/test/createClientWithFundedWallet.js index c64bf87aa14..01ceff8c757 100644 --- a/packages/platform-test-suite/lib/test/createClientWithFundedWallet.js +++ b/packages/platform-test-suite/lib/test/createClientWithFundedWallet.js @@ -19,7 +19,7 @@ let faucetClient; * @returns {Promise} */ async function createClientWithFundedWallet(HDPrivateKey = undefined, amount = 40000) { - const useFaucetWalletStorage = process.env.FAUCET_WALLET_USE_STORAGE === "true" + const useFaucetWalletStorage = process.env.FAUCET_WALLET_USE_STORAGE === 'true'; const seeds = getDAPISeeds(); const clientOpts = { diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index 1a58201e9f7..43907ba91e4 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -1,15 +1,7 @@ const Dash = require('dash'); - -let storageAdapter; - -if (typeof window === 'undefined') { - // eslint-disable-next-line global-require - const { NodeForage } = require('nodeforage'); - storageAdapter = new NodeForage({ name: `../../db/faucet-wallet-${process.env.FAUCET_ADDRESS}` }); -} else { - // eslint-disable-next-line global-require - storageAdapter = require('localforage'); -} +const { NodeForage } = require('nodeforage'); +const LocalForage = require('localforage'); +const path = require('path'); const { contractId } = require('@dashevo/dpns-contract/lib/systemIds'); @@ -34,8 +26,15 @@ function createFaucetClient() { privateKey: process.env.FAUCET_PRIVATE_KEY, }; - if (process.env.FAUCET_WALLET_USE_STORAGE === "true") { - walletOptions.adapter = storageAdapter; + if (process.env.FAUCET_WALLET_USE_STORAGE === 'true') { + if (typeof window === 'undefined') { + walletOptions.adapter = new NodeForage({ + name: path.join(process.env.FAUCET_STORAGE_DIR, + `faucet-wallet-${process.env.FAUCET_ADDRESS}`), + }); + } else { + walletOptions.adapter = LocalForage; + } } if (process.env.SKIP_SYNC_BEFORE_HEIGHT) { diff --git a/scripts/configure_test_suite.sh b/scripts/configure_test_suite.sh index 4d59af83538..1729e8ee60e 100755 --- a/scripts/configure_test_suite.sh +++ b/scripts/configure_test_suite.sh @@ -52,6 +52,7 @@ echo "DAPI_SEED=127.0.0.1 FAUCET_ADDRESS=${FAUCET_ADDRESS} FAUCET_PRIVATE_KEY=${FAUCET_PRIVATE_KEY} FAUCET_WALLET_USE_STORAGE=${FAUCET_WALLET_USE_STORAGE} +FAUCET_STORAGE_DIR="${PATH_TO_PROJECT_ROOT}/db" DPNS_OWNER_PRIVATE_KEY=${DPNS_OWNER_PRIVATE_KEY} FEATURE_FLAGS_OWNER_PRIVATE_KEY=${FEATURE_FLAGS_OWNER_PRIVATE_KEY} DASHPAY_OWNER_PRIVATE_KEY=${DASHPAY_OWNER_PRIVATE_KEY} From 14b912b769c269d1036ef8da72b1561644a6cbe3 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Wed, 8 Jun 2022 00:49:48 +0400 Subject: [PATCH 04/20] chore: update documentation --- packages/platform-test-suite/README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/platform-test-suite/README.md b/packages/platform-test-suite/README.md index 613e74cb684..0f2db26938b 100644 --- a/packages/platform-test-suite/README.md +++ b/packages/platform-test-suite/README.md @@ -26,7 +26,7 @@ To run using [Docker](https://www.docker.com/), make sure you have it installed. Install all the necessary dependencies: ```sh -$ npm i +$ yarn ``` Use `./bin/test.sh` script to run tests: @@ -45,9 +45,14 @@ Usage: test [options] -s=a,b,c --scope=a,b,c - test scope to run -k=key --faucet-key=key - faucet private key string -n=network --network=network - use regtest, devnet or testnet + --skip-sync-before-height=H - start sync funding wallet from specific height --dpns-tld-identity-private-key=private_key - top level identity private key - --dpns-tld-identity-id=identity_id - top level identity id - --dpns-contract-id=contract_id - dpns contract id + --dpns-tld-identity-id=tld_identity_id - top level identity id + --dpns-contract-id=tld_contract_id - dpns contract id + --feature-flags-identity-id=ff_identity_id - feature-flags contract id + --feature-flags-contract-id=ff_contract_id - feature-flags contract id + --faucet-storage-dir=absolute_dir - specify directory where faucet wallet persistent storage will be stored + -t --timeout - test timeout in milliseconds -h --help - show help Possible scopes: From 9c04dc9724afde585b64b237754ae7676c73d48f Mon Sep 17 00:00:00 2001 From: pshenmic Date: Thu, 9 Jun 2022 15:31:44 +0400 Subject: [PATCH 05/20] fix: move back if --- .../lib/test/createFaucetClient.js | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index 43907ba91e4..4d297a2c5bb 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -1,9 +1,20 @@ const Dash = require('dash'); -const { NodeForage } = require('nodeforage'); -const LocalForage = require('localforage'); const path = require('path'); -const { contractId } = require('@dashevo/dpns-contract/lib/systemIds'); +let storageAdapter; + +if (typeof window === 'undefined') { + // eslint-disable-next-line global-require + const {NodeForage} = require('nodeforage'); + storageAdapter = new NodeForage({ + name: path.join(process.env.FAUCET_STORAGE_DIR, `faucet-wallet-${process.env.FAUCET_ADDRESS}`), + }); +} else { + // eslint-disable-next-line global-require + storageAdapter = require('localforage'); +} + +const {contractId} = require('@dashevo/dpns-contract/lib/systemIds'); const getDAPISeeds = require('./getDAPISeeds'); @@ -27,14 +38,7 @@ function createFaucetClient() { }; if (process.env.FAUCET_WALLET_USE_STORAGE === 'true') { - if (typeof window === 'undefined') { - walletOptions.adapter = new NodeForage({ - name: path.join(process.env.FAUCET_STORAGE_DIR, - `faucet-wallet-${process.env.FAUCET_ADDRESS}`), - }); - } else { - walletOptions.adapter = LocalForage; - } + walletOptions.adapter = storageAdapter } if (process.env.SKIP_SYNC_BEFORE_HEIGHT) { From 4d10f9a232b28d39eb7cceb63353634b2fd757f9 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Thu, 9 Jun 2022 15:41:52 +0400 Subject: [PATCH 06/20] fix: code review fixes --- packages/platform-test-suite/README.md | 13 ++++++++++--- packages/platform-test-suite/bin/test.sh | 19 +++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/packages/platform-test-suite/README.md b/packages/platform-test-suite/README.md index 0f2db26938b..e3e31383d4a 100644 --- a/packages/platform-test-suite/README.md +++ b/packages/platform-test-suite/README.md @@ -51,7 +51,8 @@ Usage: test [options] --dpns-contract-id=tld_contract_id - dpns contract id --feature-flags-identity-id=ff_identity_id - feature-flags contract id --feature-flags-contract-id=ff_contract_id - feature-flags contract id - --faucet-storage-dir=absolute_dir - specify directory where faucet wallet persistent storage will be stored + --faucet-wallet-use-storage=true - use persistent wallet storage for faucet + --faucet-wallet-storage-dir=absolute_dir - specify directory where faucet wallet persistent storage will be stored -t --timeout - test timeout in milliseconds -h --help - show help @@ -84,9 +85,15 @@ Usage: test [options] -s=a,b,c --scope=a,b,c - test scope to run -k=key --faucet-key=key - faucet private key string -n=network --network=network - use regtest, devnet or testnet + --skip-sync-before-height=H - start sync funding wallet from specific height --dpns-tld-identity-private-key=private_key - top level identity private key - --dpns-tld-identity-id=identity_id - top level identity id - --dpns-contract-id=contract_id - dpns contract id + --dpns-tld-identity-id=tld_identity_id - top level identity id + --dpns-contract-id=tld_contract_id - dpns contract id + --feature-flags-identity-id=ff_identity_id - feature-flags contract id + --feature-flags-contract-id=ff_contract_id - feature-flags contract id + --faucet-wallet-use-storage=true - use persistent wallet storage for faucet + --faucet-wallet-storage-dir=absolute_dir - specify directory where faucet wallet persistent storage will be stored + -t --timeout - test timeout in milliseconds -h --help - show help Possible scopes: diff --git a/packages/platform-test-suite/bin/test.sh b/packages/platform-test-suite/bin/test.sh index 23fee39b20e..9bd58345b89 100755 --- a/packages/platform-test-suite/bin/test.sh +++ b/packages/platform-test-suite/bin/test.sh @@ -19,6 +19,8 @@ Usage: test [options] --dpns-contract-id=tld_contract_id - dpns contract id --feature-flags-identity-id=ff_identity_id - feature-flags contract id --feature-flags-contract-id=ff_contract_id - feature-flags contract id + --faucet-wallet-use-storage=true - use persistent wallet storage for faucet + --faucet-wallet-storage-dir=absolute_dir - specify directory where faucet wallet persistent storage will be stored -t --timeout - test timeout in milliseconds -h --help - show help @@ -78,8 +80,12 @@ case ${i} in ;; -t=*|--timeout=*) timeout="${i#*=}" - --faucet-storage-dir=*) - faucet_storage_dir="${i#*=}" + ;; + --faucet-wallet-storage-dir=*) + faucet_wallet_storage_dir="${i#*=}" + ;; + --faucet-wallet-use-storage=*) + faucet_wallet_use_storage="${i#*=}" ;; esac done @@ -189,9 +195,14 @@ then cmd="${cmd} DPNS_TOP_LEVEL_IDENTITY_PRIVATE_KEY=${identity_private_key}" fi -if [ -n "$faucet_storage_dir" ] +if [ -n "$faucet_wallet_use_storage" ] +then + cmd="${cmd} FAUCET_WALLET_USE_STORAGE=${faucet_wallet_use_storage}" +fi + +if [ -n "$faucet_wallet_storage_dir" ] then - cmd="${cmd} FAUCET_STORAGE_DIR=${faucet_storage_dir}" + cmd="${cmd} FAUCET_WALLET_STORAGE_DIR=${faucet_wallet_storage_dir}" fi if [ -n "$GITHUB_ACTIONS" ] From ae4eb62adefd01f1e94d93798762885ec9bc3179 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Thu, 9 Jun 2022 15:43:03 +0400 Subject: [PATCH 07/20] fix: code review fixes --- packages/platform-test-suite/lib/test/createFaucetClient.js | 2 +- scripts/configure_test_suite.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index 4d297a2c5bb..a7aee04adb3 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -7,7 +7,7 @@ if (typeof window === 'undefined') { // eslint-disable-next-line global-require const {NodeForage} = require('nodeforage'); storageAdapter = new NodeForage({ - name: path.join(process.env.FAUCET_STORAGE_DIR, `faucet-wallet-${process.env.FAUCET_ADDRESS}`), + name: path.join(process.env.FAUCET_WALLET_STORAGE_DIR, `faucet-wallet-${process.env.FAUCET_ADDRESS}`), }); } else { // eslint-disable-next-line global-require diff --git a/scripts/configure_test_suite.sh b/scripts/configure_test_suite.sh index 1729e8ee60e..955d01de8df 100755 --- a/scripts/configure_test_suite.sh +++ b/scripts/configure_test_suite.sh @@ -52,7 +52,7 @@ echo "DAPI_SEED=127.0.0.1 FAUCET_ADDRESS=${FAUCET_ADDRESS} FAUCET_PRIVATE_KEY=${FAUCET_PRIVATE_KEY} FAUCET_WALLET_USE_STORAGE=${FAUCET_WALLET_USE_STORAGE} -FAUCET_STORAGE_DIR="${PATH_TO_PROJECT_ROOT}/db" +FAUCET_WALLET_STORAGE_DIR="${PATH_TO_PROJECT_ROOT}/db" DPNS_OWNER_PRIVATE_KEY=${DPNS_OWNER_PRIVATE_KEY} FEATURE_FLAGS_OWNER_PRIVATE_KEY=${FEATURE_FLAGS_OWNER_PRIVATE_KEY} DASHPAY_OWNER_PRIVATE_KEY=${DASHPAY_OWNER_PRIVATE_KEY} From 660b64c6ec01b269116ea89fadb39ac25bb656b5 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Thu, 9 Jun 2022 15:54:42 +0400 Subject: [PATCH 08/20] fix: fall back to current working directory --- packages/platform-test-suite/lib/test/createFaucetClient.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index a7aee04adb3..668da100c84 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -7,7 +7,8 @@ if (typeof window === 'undefined') { // eslint-disable-next-line global-require const {NodeForage} = require('nodeforage'); storageAdapter = new NodeForage({ - name: path.join(process.env.FAUCET_WALLET_STORAGE_DIR, `faucet-wallet-${process.env.FAUCET_ADDRESS}`), + name: path.join(process.env.FAUCET_WALLET_STORAGE_DIR || process.cwd(), + `faucet-wallet-${process.env.FAUCET_ADDRESS}`), }); } else { // eslint-disable-next-line global-require From 392633e2e8db6c615b741de82ab45dae27b1ac86 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Thu, 9 Jun 2022 22:44:11 +0400 Subject: [PATCH 09/20] fix: use last argument to gather seed url --- packages/platform-test-suite/bin/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/platform-test-suite/bin/test.sh b/packages/platform-test-suite/bin/test.sh index 9bd58345b89..0571e715411 100755 --- a/packages/platform-test-suite/bin/test.sh +++ b/packages/platform-test-suite/bin/test.sh @@ -34,7 +34,7 @@ Usage: test [options] functional:core functional:platform" -DAPI_SEED="$1" +DAPI_SEED="${@: -1}" network="testnet" DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" From 60d44e528a5c26184f7cd37379d125461315f44b Mon Sep 17 00:00:00 2001 From: pshenmic Date: Thu, 9 Jun 2022 22:58:56 +0400 Subject: [PATCH 10/20] fix: add missing json extension --- packages/platform-test-suite/lib/test/createFaucetClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index 668da100c84..8a8da53a32c 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -8,7 +8,7 @@ if (typeof window === 'undefined') { const {NodeForage} = require('nodeforage'); storageAdapter = new NodeForage({ name: path.join(process.env.FAUCET_WALLET_STORAGE_DIR || process.cwd(), - `faucet-wallet-${process.env.FAUCET_ADDRESS}`), + `faucet-wallet-${process.env.FAUCET_ADDRESS}.json`), }); } else { // eslint-disable-next-line global-require From 4788a677684f637b8cfa031ef9a17c271234ec71 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Thu, 9 Jun 2022 23:04:16 +0400 Subject: [PATCH 11/20] chore: fix lint --- packages/platform-test-suite/lib/test/createFaucetClient.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index 8a8da53a32c..430ea6ec1fd 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -5,7 +5,7 @@ let storageAdapter; if (typeof window === 'undefined') { // eslint-disable-next-line global-require - const {NodeForage} = require('nodeforage'); + const { NodeForage } = require('nodeforage'); storageAdapter = new NodeForage({ name: path.join(process.env.FAUCET_WALLET_STORAGE_DIR || process.cwd(), `faucet-wallet-${process.env.FAUCET_ADDRESS}.json`), @@ -15,7 +15,7 @@ if (typeof window === 'undefined') { storageAdapter = require('localforage'); } -const {contractId} = require('@dashevo/dpns-contract/lib/systemIds'); +const { contractId } = require('@dashevo/dpns-contract/lib/systemIds'); const getDAPISeeds = require('./getDAPISeeds'); @@ -39,7 +39,7 @@ function createFaucetClient() { }; if (process.env.FAUCET_WALLET_USE_STORAGE === 'true') { - walletOptions.adapter = storageAdapter + walletOptions.adapter = storageAdapter; } if (process.env.SKIP_SYNC_BEFORE_HEIGHT) { From e6c58a5b5b390eb053a7db57e902cc9695fe3462 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Thu, 9 Jun 2022 23:14:03 +0400 Subject: [PATCH 12/20] fix: remove extension --- packages/platform-test-suite/lib/test/createFaucetClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index 430ea6ec1fd..50055cc04b2 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -8,7 +8,7 @@ if (typeof window === 'undefined') { const { NodeForage } = require('nodeforage'); storageAdapter = new NodeForage({ name: path.join(process.env.FAUCET_WALLET_STORAGE_DIR || process.cwd(), - `faucet-wallet-${process.env.FAUCET_ADDRESS}.json`), + `faucet-wallet-${process.env.FAUCET_ADDRESS}`), }); } else { // eslint-disable-next-line global-require From 5188a0371560e2598b1ccb8cfc9936c07067ae58 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Mon, 13 Jun 2022 08:42:51 +0400 Subject: [PATCH 13/20] chore: bump nodeforage --- .pnp.cjs | 8 ++++---- ...deforage-npm-1.1.1-88cd0e2f0f-0cb4e4aa85.zip | Bin 11833 -> 0 bytes packages/platform-test-suite/package.json | 2 +- yarn.lock | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .yarn/cache/nodeforage-npm-1.1.1-88cd0e2f0f-0cb4e4aa85.zip diff --git a/.pnp.cjs b/.pnp.cjs index 9e0bd234331..37ea49c11ab 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -2779,7 +2779,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["localforage", "npm:1.10.0"], ["mocha", "npm:9.1.3"], ["net", "npm:1.0.2"], - ["nodeforage", "npm:1.1.1"], + ["nodeforage", "npm:1.1.2"], ["os-browserify", "npm:0.3.0"], ["path-browserify", "npm:1.0.1"], ["process", "npm:0.11.10"], @@ -13592,10 +13592,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["nodeforage", [ - ["npm:1.1.1", { - "packageLocation": "./.yarn/cache/nodeforage-npm-1.1.1-88cd0e2f0f-0cb4e4aa85.zip/node_modules/nodeforage/", + ["npm:1.1.2", { + "packageLocation": "./.yarn/cache/nodeforage-npm-1.1.2-38c6ac6257-a670ece8b5.zip/node_modules/nodeforage/", "packageDependencies": [ - ["nodeforage", "npm:1.1.1"], + ["nodeforage", "npm:1.1.2"], ["lodash.find", "npm:4.6.0"], ["lodash.ismatch", "npm:4.4.0"], ["lodash.merge", "npm:4.6.2"], diff --git a/.yarn/cache/nodeforage-npm-1.1.1-88cd0e2f0f-0cb4e4aa85.zip b/.yarn/cache/nodeforage-npm-1.1.1-88cd0e2f0f-0cb4e4aa85.zip deleted file mode 100644 index a50be23ad4ec9595b398f4af144e89d8660d2521..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11833 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 Date: Mon, 13 Jun 2022 09:18:38 +0400 Subject: [PATCH 14/20] chore: cache nodeforage --- ...deforage-npm-1.1.2-38c6ac6257-a670ece8b5.zip | Bin 0 -> 11843 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .yarn/cache/nodeforage-npm-1.1.2-38c6ac6257-a670ece8b5.zip diff --git a/.yarn/cache/nodeforage-npm-1.1.2-38c6ac6257-a670ece8b5.zip b/.yarn/cache/nodeforage-npm-1.1.2-38c6ac6257-a670ece8b5.zip new file mode 100644 index 0000000000000000000000000000000000000000..c74ecca2ae961da4bab6fd15ff29020513b87255 GIT binary patch literal 11843 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 Date: Mon, 13 Jun 2022 09:18:54 +0400 Subject: [PATCH 15/20] feat: pass working dir to nodeforage --- packages/platform-test-suite/lib/test/createFaucetClient.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/platform-test-suite/lib/test/createFaucetClient.js b/packages/platform-test-suite/lib/test/createFaucetClient.js index 50055cc04b2..52e9fd3a089 100644 --- a/packages/platform-test-suite/lib/test/createFaucetClient.js +++ b/packages/platform-test-suite/lib/test/createFaucetClient.js @@ -7,8 +7,8 @@ if (typeof window === 'undefined') { // eslint-disable-next-line global-require const { NodeForage } = require('nodeforage'); storageAdapter = new NodeForage({ - name: path.join(process.env.FAUCET_WALLET_STORAGE_DIR || process.cwd(), - `faucet-wallet-${process.env.FAUCET_ADDRESS}`), + dir: process.env.FAUCET_WALLET_STORAGE_DIR || process.cwd(), + name: `faucet-wallet-${process.env.FAUCET_ADDRESS}`, }); } else { // eslint-disable-next-line global-require From de75cb5204f0076114fcb5ae2a5f1abd3d807cda Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 14 Jun 2022 15:37:37 +0400 Subject: [PATCH 16/20] fix: migrate to yarn --- packages/platform-test-suite/README.md | 2 -- packages/platform-test-suite/bin/test.sh | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/packages/platform-test-suite/README.md b/packages/platform-test-suite/README.md index e3e31383d4a..cfbc8708925 100644 --- a/packages/platform-test-suite/README.md +++ b/packages/platform-test-suite/README.md @@ -41,7 +41,6 @@ Usage: test [options] can be IP or IP:port Options: - --npm-install=pkg - install npm package before running the suite -s=a,b,c --scope=a,b,c - test scope to run -k=key --faucet-key=key - faucet private key string -n=network --network=network - use regtest, devnet or testnet @@ -81,7 +80,6 @@ Usage: test [options] can be IP or IP:port Options: - --npm-install=pkg - install npm package before running the suite -s=a,b,c --scope=a,b,c - test scope to run -k=key --faucet-key=key - faucet private key string -n=network --network=network - use regtest, devnet or testnet diff --git a/packages/platform-test-suite/bin/test.sh b/packages/platform-test-suite/bin/test.sh index 0571e715411..03e153e9592 100755 --- a/packages/platform-test-suite/bin/test.sh +++ b/packages/platform-test-suite/bin/test.sh @@ -9,7 +9,6 @@ Usage: test [options] can be IP or IP:port Options: - --npm-install=pkg - install npm package before running the suite -s=a,b,c --scope=a,b,c - test scope to run -k=key --faucet-key=key - faucet private key string -n=network --network=network - use regtest, devnet or testnet @@ -48,9 +47,6 @@ case ${i} in echo "$cmd_usage" exit 0 ;; - --npm-install=*) - npm_package_to_install="${i#*=}" - ;; -s=*|--scope=*) scope="${i#*=}" ;; @@ -104,12 +100,6 @@ then exit 1 fi -if [ -n "$npm_package_to_install" ] -then - npm install "$npm_package_to_install" - npm dedupe -fi - if [ -n "$scope" ] then scope_dirs="" @@ -209,7 +199,7 @@ if [ -n "$GITHUB_ACTIONS" ] then cmd="${cmd} NODE_ENV=test node_modules/.bin/mocha -b ${scope_dirs}" else - cmd="${cmd} NODE_ENV=test mocha -b ${scope_dirs}" + cmd="${cmd} NODE_ENV=test yarn mocha -b ${scope_dirs}" fi if [ -n "$timeout" ] From 0d27c09069f00329349423cc84e8c3404a4c9ea5 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Fri, 17 Jun 2022 18:22:32 +0400 Subject: [PATCH 17/20] feat: add entrypoint for platform test suite docker image --- packages/platform-test-suite/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/platform-test-suite/Dockerfile b/packages/platform-test-suite/Dockerfile index 5b6cc49104b..5796c0cd5f6 100644 --- a/packages/platform-test-suite/Dockerfile +++ b/packages/platform-test-suite/Dockerfile @@ -62,3 +62,5 @@ COPY --from=builder /platform /platform RUN cp /platform/packages/platform-test-suite/.env.example /platform/packages/platform-test-suite/.env EXPOSE 2500 2501 2510 + +ENTRYPOINT ["/platform/packages/platform-test-suite/bin/test.sh"] From 56d35b5e3c1afc796f7007dcb816809768f10cc2 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Fri, 17 Jun 2022 18:56:10 +0400 Subject: [PATCH 18/20] chore: doc update --- packages/platform-test-suite/README.md | 4 ++-- packages/platform-test-suite/bin/test.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/platform-test-suite/README.md b/packages/platform-test-suite/README.md index cfbc8708925..8b8d298bbb7 100644 --- a/packages/platform-test-suite/README.md +++ b/packages/platform-test-suite/README.md @@ -38,7 +38,7 @@ Run test suite Usage: test [options] - can be IP or IP:port + can be IP or IP:port (or pass via DAPI_SEED env) Options: -s=a,b,c --scope=a,b,c - test scope to run @@ -77,7 +77,7 @@ Run test suite Usage: test [options] - can be IP or IP:port + can be IP or IP:port (or pass via DAPI_SEED env) Options: -s=a,b,c --scope=a,b,c - test scope to run diff --git a/packages/platform-test-suite/bin/test.sh b/packages/platform-test-suite/bin/test.sh index 03e153e9592..f5c36ce2a53 100755 --- a/packages/platform-test-suite/bin/test.sh +++ b/packages/platform-test-suite/bin/test.sh @@ -6,7 +6,7 @@ cmd_usage="Run test suite Usage: test [options] - can be IP or IP:port + can be IP or IP:port (or pass via DAPI_SEED env) Options: -s=a,b,c --scope=a,b,c - test scope to run @@ -33,7 +33,8 @@ Usage: test [options] functional:core functional:platform" -DAPI_SEED="${@: -1}" +FIRST_ARG="$1" +DAPI_SEED="${DAPI_SEED:=FIRST_ARG}" network="testnet" DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" From 6d1d8e02c6ee66456d62a7de2cccdc972ad77e3a Mon Sep 17 00:00:00 2001 From: pshenmic Date: Fri, 24 Jun 2022 17:17:34 +0400 Subject: [PATCH 19/20] fix: missing $ --- packages/platform-test-suite/bin/test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/platform-test-suite/bin/test.sh b/packages/platform-test-suite/bin/test.sh index f5c36ce2a53..718f803d9c8 100755 --- a/packages/platform-test-suite/bin/test.sh +++ b/packages/platform-test-suite/bin/test.sh @@ -34,7 +34,7 @@ Usage: test [options] functional:platform" FIRST_ARG="$1" -DAPI_SEED="${DAPI_SEED:=FIRST_ARG}" +DAPI_SEED="${DAPI_SEED:=$FIRST_ARG}" network="testnet" DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" @@ -200,7 +200,8 @@ if [ -n "$GITHUB_ACTIONS" ] then cmd="${cmd} NODE_ENV=test node_modules/.bin/mocha -b ${scope_dirs}" else - cmd="${cmd} NODE_ENV=test yarn mocha -b ${scope_dirs}" + echo $cmd + cmd="${cmd} NODE_ENV=test yarn mocha --inspect-brk -b ${scope_dirs}" fi if [ -n "$timeout" ] From 66c5f1cabb42163867dc5616547f13a69487278f Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 28 Jun 2022 10:22:14 +0400 Subject: [PATCH 20/20] chore: add --env file in doc --- packages/platform-test-suite/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/platform-test-suite/README.md b/packages/platform-test-suite/README.md index 8b8d298bbb7..0256ed2c8d3 100644 --- a/packages/platform-test-suite/README.md +++ b/packages/platform-test-suite/README.md @@ -71,7 +71,7 @@ Usage: test [options] Just run pre-built image using the same arguments as [running locally](#running-locally): ```sh -$ docker run --network=host dashpay/platform-test-suite +$ docker run --network=host --env ./.env dashpay/platform-test-suite Run test suite