Manual tests of removing the second worker during running (#2316)

* resuming worker tests

* move resuming worker test to separate workspace

* correct script name

* add workspace

* fix evm build

* lock file

* fix package.json

* missing worker workspace deps

* adjust bitcoin identity test docker compose

* fix test

* remove unwanted paths from tsconfig.json

* add config

* add tracing

* add more dev deps

* debug

* remove problematic function

* debugging

* add withRetry

* remove sleep

---------

Co-authored-by: Zhouhui Tian <125243011+zhouhuitian@users.noreply.github.com>

.github/workflows/ci.yml

@@ -625,8 +625,6 @@ jobs:
           - test_name: lit-parentchain-nonce
           - test_name: lit-ii-batch-test
           - test_name: lit-test-stress-script
-          # disabled due to P-208
-          # - test_name: lit-resume-worker
     steps:
       - uses: actions/checkout@v4
 
@@ -709,6 +707,7 @@ jobs:
           - test_name: lit-ii-batch-test-multiworker
           - test_name: lit-ii-identity-multiworker-test
           - test_name: lit-ii-vc-multiworker-test
+          - test_name: lit-resume-worker
     steps:
       - uses: actions/checkout@v4
 

tee-worker/cli/lit_ts_test.sh → tee-worker/cli/lit_ts_integration_test.sh

@@ -40,7 +40,7 @@ CLIENT="${CLIENT_BIN} -p ${NPORT} -P ${WORKER1PORT} -u ${NODEURL} -U ${WORKER1UR
 
 function usage() {
     echo ""
-    echo "This is a script for tee-worker ts-test. Preparing to test: $1"
+    echo "This is a script for tee-worker integration ts tests. Pass test name as first argument"
     echo ""
 
 }

tee-worker/cli/lit_ts_worker_test.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Copyright 2020-2023 Trust Computing GmbH.
+
+set -euo pipefail
+
+function usage() {
+    echo ""
+    echo "This is a script for tee-worker worker ts-test. Pass test name as first argument"
+    echo ""
+}
+
+[ $# -ne 1 ] && (usage; exit 1)
+TEST=$1
+
+
+BINARY_DIR="/usr/local/bin"
+NODE_ENDPOINT="ws://litentry-node:9912"
+
+echo "Using binary dir: $BINARY_DIR"
+echo "Using node endpoint: $NODE_ENDPOINT"
+
+cd /ts-tests
+pnpm install
+pnpm --filter worker run $TEST:staging

tee-worker/docker/lit-di-bitcoin-identity-test.yml

@@ -17,7 +17,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-bitcoin-identity 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-di-bitcoin-identity 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-di-evm-identity-multiworker-test.yml

@@ -21,7 +21,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-evm-identity 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-di-evm-identity 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-di-evm-identity-test.yml

@@ -17,7 +17,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-evm-identity 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-di-evm-identity 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-di-substrate-identity-multiworker-test.yml

@@ -21,7 +21,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-substrate-identity 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-di-substrate-identity 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-di-substrate-identity-test.yml

@@ -17,7 +17,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-substrate-identity 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-di-substrate-identity 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-di-vc-multiworker-test.yml

@@ -21,7 +21,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-vc 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-di-vc 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-di-vc-test.yml

@@ -17,7 +17,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-vc 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-di-vc 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-ii-batch-test-multiworker.yml

@@ -21,7 +21,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-batch 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-ii-batch 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-ii-batch-test.yml

@@ -17,7 +17,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-batch 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-ii-batch 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-ii-identity-multiworker-test.yml

@@ -21,7 +21,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-identity 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-ii-identity 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-ii-identity-test.yml

@@ -17,7 +17,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-identity 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-ii-identity 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-ii-vc-multiworker-test.yml

@@ -21,7 +21,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-vc 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-ii-vc 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-ii-vc-test.yml

@@ -17,7 +17,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-vc 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-ii-vc 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/docker/lit-resume-worker.yml

@@ -15,9 +15,8 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-resuming-worker 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_worker_test.sh test-resuming-worker 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:
-        driver: bridge
-# docker compose -f docker-compose.yml -f resume-worker.yml up relaychain-alice relaychain-bob litentry-node --no-build --exit-code-from resume-worker -- resume-worker
+        driver: bridge

tee-worker/docker/lit-test-stress-script.yml

@@ -17,7 +17,7 @@ services:
                 condition: service_healthy
         networks:
             - litentry-test-network
-        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-stress-script 2>&1' "
+        entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_integration_test.sh test-stress-script 2>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/ts-tests/integration-tests/common/utils/crypto.ts

@@ -7,7 +7,7 @@ import { KeyringPair } from '@polkadot/keyring/types';
 import { ethers } from 'ethers';
 import { blake2AsU8a } from '@polkadot/util-crypto';
 import bitcore from 'bitcore-lib';
-import { IntegrationTestContext } from 'common/common-types';
+import { IntegrationTestContext } from './../common-types';
 import { buildIdentityHelper } from './identity-helper';
 
 export type KeypairType = 'ed25519' | 'sr25519' | 'ecdsa' | 'ethereum' | 'bitcoin';

tee-worker/ts-tests/integration-tests/package.json

@@ -15,8 +15,6 @@
         "test-di-bitcoin-identity:staging": "pnpm exec eslint . && pnpm exec cross-env NODE_ENV=staging mocha --exit --sort -r ts-node/register --loader=ts-node/esm 'di_bitcoin_identity.test.ts'",
         "test-di-vc:local": "pnpm exec eslint . && pnpm exec cross-env NODE_ENV=local mocha --exit --sort -r ts-node/register --loader=ts-node/esm 'di_vc.test.ts'",
         "test-di-vc:staging": "pnpm exec eslint . && pnpm exec cross-env NODE_ENV=staging mocha --exit --sort -r ts-node/register --loader=ts-node/esm 'di_vc.test.ts'",
-        "test-resuming-worker:staging": "pnpm exec eslint . && pnpm exec cross-env NODE_ENV=staging mocha --exit --sort -r ts-node/register --loader=ts-node/esm 'resuming_worker.test.ts'",
-        "test-resuming-worker:local": "pnpm exec eslint . && pnpm exec cross-env NODE_ENV=local mocha --exit --sort -r ts-node/register --loader=ts-node/esm 'resuming_worker.test.ts'",
         "test-ii-vc:local": "pnpm exec eslint . && pnpm exec cross-env NODE_ENV=local mocha --exit --sort -r ts-node/register --loader=ts-node/esm 'ii_vc.test.ts'",
         "test-ii-vc:staging": "pnpm exec eslint . && pnpm exec cross-env NODE_ENV=staging mocha --exit --sort -r ts-node/register --loader=ts-node/esm 'ii_vc.test.ts'",
         "test-ii-batch:local": "pnpm exec eslint . && pnpm exec cross-env NODE_ENV=local mocha --exit --sort -r ts-node/register --loader=ts-node/esm 'ii_batch.test.ts'",

tee-worker/ts-tests/pnpm-workspace.yaml

@@ -1 +1 @@
-packages: ["integration-tests", "stress"]
+packages: ["integration-tests", "stress", "worker"]

tee-worker/ts-tests/worker/.env.local.example

@@ -0,0 +1,3 @@
+NODE_ENV = local
+NODE_ENDPOINT = "ws://localhost:9944"
+BINARY_DIR=/usr/local/bin

tee-worker/ts-tests/worker/.env.staging

@@ -0,0 +1,4 @@
+NODE_ENV=staging
+NODE_ENDPOINT="ws://litentry-node:9912"
+NODE_TLS_REJECT_UNAUTHORIZED=0
+BINARY_DIR=/usr/local/bin