From 07e168b47355448ddf52ebbfec9a3a886fd88373 Mon Sep 17 00:00:00 2001 From: Kailai Wang Date: Thu, 5 Sep 2024 08:25:59 +0000 Subject: [PATCH 1/3] Simplfy bridge scripts --- .github/file-filter.yml | 6 +++--- Makefile | 4 ---- scripts/{build-bridge-docker.sh => build-bridge.sh} | 0 ...aunch-local-bridge-docker.sh => launch-bridge.sh} | 2 +- scripts/launch-local-bridge-binary.sh | 12 ------------ scripts/run-ts-test.sh | 2 +- 6 files changed, 5 insertions(+), 21 deletions(-) rename scripts/{build-bridge-docker.sh => build-bridge.sh} (100%) rename scripts/{launch-local-bridge-docker.sh => launch-bridge.sh} (96%) delete mode 100755 scripts/launch-local-bridge-binary.sh diff --git a/.github/file-filter.yml b/.github/file-filter.yml index 2dd2756bb7..78fcfb2972 100644 --- a/.github/file-filter.yml +++ b/.github/file-filter.yml @@ -16,9 +16,9 @@ parachain_src: ¶chain_src parachain_test: ¶chain_test - 'ts-tests/**' - 'docker/**' - - 'scripts/build-bridge-docker.sh' - - 'scripts/launch-local-docker.sh' - - 'scripts/launch-local-bridge-docker.sh' + - 'scripts/build-bridge.sh' + - 'scripts/launch-network.sh' + - 'scripts/launch-bridge.sh' coverage_src: &coverage_src - *parachain_src diff --git a/Makefile b/Makefile index 0fb42140d5..0c7148cf66 100644 --- a/Makefile +++ b/Makefile @@ -72,10 +72,6 @@ launch-network-rococo: launch-network-litentry: @./scripts/launch-network.sh litentry -.PHONY: launch-docker-bridge -launch-docker-bridge: - @./scripts/launch-local-bridge-docker.sh - # run tests .PHONY: test-cargo-all ## cargo test --all diff --git a/scripts/build-bridge-docker.sh b/scripts/build-bridge.sh similarity index 100% rename from scripts/build-bridge-docker.sh rename to scripts/build-bridge.sh diff --git a/scripts/launch-local-bridge-docker.sh b/scripts/launch-bridge.sh similarity index 96% rename from scripts/launch-local-bridge-docker.sh rename to scripts/launch-bridge.sh index 857857faba..6fc076d013 100755 --- a/scripts/launch-local-bridge-docker.sh +++ b/scripts/launch-bridge.sh @@ -7,7 +7,7 @@ ROOTDIR=$(git rev-parse --show-toplevel) if [[ "$(docker image inspect litentry/chainbridge:latest 2>/dev/null)" == "[]" ]]; then echo "litentry/chainbridge:latest image not found..." - ${ROOTDIR}/scripts/build-bridge-docker.sh + ${ROOTDIR}/scripts/build-bridge.sh fi echo "------------------------------------------------------------" diff --git a/scripts/launch-local-bridge-binary.sh b/scripts/launch-local-bridge-binary.sh deleted file mode 100755 index 9f504c6e77..0000000000 --- a/scripts/launch-local-bridge-binary.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:-"/tmp/parachain_dev"} -[ -d "$LITENTRY_PARACHAIN_DIR" ] || mkdir -p "$LITENTRY_PARACHAIN_DIR" - -ROOTDIR=$(git rev-parse --show-toplevel) - -GOPATH=${HOME}/go go install github.com/litentry/ChainBridge/cmd/chainbridge@sol0.8.19 - -cp ${HOME}/go/bin/chainbridge $LITENTRY_PARACHAIN_DIR/chainbridge - -${ROOTDIR}/scripts/geth/run_geth.sh diff --git a/scripts/run-ts-test.sh b/scripts/run-ts-test.sh index 83f5747fb9..9f41067b75 100755 --- a/scripts/run-ts-test.sh +++ b/scripts/run-ts-test.sh @@ -29,7 +29,7 @@ pnpm install pnpm run test-filter 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" if $bridge; then - $ROOTDIR/scripts/launch-local-bridge-docker.sh + $ROOTDIR/scripts/launch-bridge.sh pnpm run test-bridge 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" fi From 9218b8e635fe776a50f512ea11cd1d032bb0f397 Mon Sep 17 00:00:00 2001 From: Kailai Wang Date: Thu, 5 Sep 2024 09:17:59 +0000 Subject: [PATCH 2/3] update --- .gitignore | 2 +- bitacross-worker/scripts/litentry/cleanup.sh | 12 ------------ tee-worker/scripts/litentry/cleanup.sh | 12 ------------ 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100755 bitacross-worker/scripts/litentry/cleanup.sh delete mode 100755 tee-worker/scripts/litentry/cleanup.sh diff --git a/.gitignore b/.gitignore index 4c8ae051ef..08035fa2c3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ tags.lock recipe.json rococo-fork.json -gethdata +**/gethdata/ *.patch /log diff --git a/bitacross-worker/scripts/litentry/cleanup.sh b/bitacross-worker/scripts/litentry/cleanup.sh deleted file mode 100755 index c1271e4eb9..0000000000 --- a/bitacross-worker/scripts/litentry/cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -eo pipefail - -pid=$(ps aux | grep '[l]ocal-setup/launch' | awk '{print $2}') - -if [ ! -z "$pid" ]; then - echo "killing $pid" - kill -9 "$pid" -fi - -killall litentry-worker 2>/dev/null || true diff --git a/tee-worker/scripts/litentry/cleanup.sh b/tee-worker/scripts/litentry/cleanup.sh deleted file mode 100755 index c1271e4eb9..0000000000 --- a/tee-worker/scripts/litentry/cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -eo pipefail - -pid=$(ps aux | grep '[l]ocal-setup/launch' | awk '{print $2}') - -if [ ! -z "$pid" ]; then - echo "killing $pid" - kill -9 "$pid" -fi - -killall litentry-worker 2>/dev/null || true From ad2a50e82f6821a0f97339611cd92e861d271213 Mon Sep 17 00:00:00 2001 From: Kailai Wang Date: Thu, 5 Sep 2024 09:25:15 +0000 Subject: [PATCH 3/3] update --- scripts/run-ts-test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/run-ts-test.sh b/scripts/run-ts-test.sh index 9f41067b75..0034cea988 100755 --- a/scripts/run-ts-test.sh +++ b/scripts/run-ts-test.sh @@ -26,7 +26,7 @@ LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:-"/tmp/parachain_dev"} [ -f .env ] || echo "NODE_ENV=ci" >.env pnpm install -pnpm run test-filter 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" +pnpm run test-filter 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" if $bridge; then $ROOTDIR/scripts/launch-bridge.sh @@ -34,7 +34,7 @@ if $bridge; then fi if $evm; then - pnpm run test-evm-transfer 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" - pnpm run test-evm-contract 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" - pnpm run test-precompile-contract 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" + pnpm run test-evm-transfer 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" + pnpm run test-evm-contract 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" + pnpm run test-precompile-contract 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log" fi