From bbaa61ed29c249f2faedc93614e95dd84e196644 Mon Sep 17 00:00:00 2001
From: Kai <7630809+Kailai-Wang@users.noreply.github.com>
Date: Fri, 6 Sep 2024 19:56:20 +0200
Subject: [PATCH] Clean-up bridge launching in CI (#3047)

* Simplfy bridge scripts

* update

* update
---
 .github/file-filter.yml                              |  6 +++---
 .gitignore                                           |  2 +-
 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                               | 10 +++++-----
 7 files changed, 10 insertions(+), 26 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: &parachain_src
 parachain_test: &parachain_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/.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/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..0034cea988 100755
--- a/scripts/run-ts-test.sh
+++ b/scripts/run-ts-test.sh
@@ -26,15 +26,15 @@ 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-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
 
 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