From 0ebc852bb1178140acc6085b7190e341d1218920 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 24 Nov 2023 14:21:19 +0300 Subject: [PATCH] dbg++++ --- bridges/zombienet/README.md | 2 +- bridges/zombienet/run-tests.sh | 2 +- cumulus/parachains/runtimes/bridge-hubs/README.md | 2 +- cumulus/scripts/bridges_common.sh | 4 ++-- cumulus/scripts/bridges_rococo_westend.sh | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bridges/zombienet/README.md b/bridges/zombienet/README.md index b601154b624c..8b037d47d15b 100644 --- a/bridges/zombienet/README.md +++ b/bridges/zombienet/README.md @@ -21,7 +21,7 @@ To start those tests, you need to: - build Substrate relay by running `cargo build -p substrate-relay --release` command in the [`parity-bridges-common`](https://github.com/paritytech/parity-bridges-common) repository clone. -- copy fresh `substrate-relay` binary, built in previous point, to the `~/local_bridge_testing/bin/substrate-relay`; +- copy fresh `substrate-relay` binary, built in previous point, to the `/usr/local/bin/substrate-relay`; - change the `POLKADOT_SDK_FOLDER` and `ZOMBIENET_BINARY_PATH` (and ensure that the nearby variables have correct values) in the `./run-tests.sh`. diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index c52daa5d1f76..1b44a469f034 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -7,7 +7,7 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` -export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/zombienet/tests +export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain diff --git a/cumulus/parachains/runtimes/bridge-hubs/README.md b/cumulus/parachains/runtimes/bridge-hubs/README.md index cf617db730dd..c45322cfd2ed 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/README.md +++ b/cumulus/parachains/runtimes/bridge-hubs/README.md @@ -69,7 +69,7 @@ cd parity-bridges-common git checkout -b polkadot-staging --track origin/polkadot-staging cargo build --release -p substrate-relay -cp target/release/substrate-relay ~/local_bridge_testing/bin/substrate-relay +cp target/release/substrate-relay /usr/local/bin/substrate-relay --- diff --git a/cumulus/scripts/bridges_common.sh b/cumulus/scripts/bridges_common.sh index 8d64c5ede52a..e63d098b00e3 100755 --- a/cumulus/scripts/bridges_common.sh +++ b/cumulus/scripts/bridges_common.sh @@ -16,8 +16,8 @@ function ensure_binaries() { } function ensure_relayer() { - if [[ ! -f ~/local_bridge_testing/bin/substrate-relay ]]; then - echo " Required substrate-relay binary '~/local_bridge_testing/bin/substrate-relay' does not exist!" + if [[ ! -f /usr/local/bin/substrate-relay ]]; then + echo " Required substrate-relay binary '/usr/local/bin/substrate-relay' does not exist!" echo " You need to build it and copy to this location!" echo " Please, check ./parachains/runtimes/bridge-hubs/README.md (Prepare/Build/Deploy)" exit 1 diff --git a/cumulus/scripts/bridges_rococo_westend.sh b/cumulus/scripts/bridges_rococo_westend.sh index 9b3bd350276f..b5f3c6dbf294 100755 --- a/cumulus/scripts/bridges_rococo_westend.sh +++ b/cumulus/scripts/bridges_rococo_westend.sh @@ -134,7 +134,7 @@ function init_ro_wnd() { ensure_relayer RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - ~/local_bridge_testing/bin/substrate-relay init-bridge rococo-to-bridge-hub-westend \ + /usr/local/bin/substrate-relay init-bridge rococo-to-bridge-hub-westend \ --source-host localhost \ --source-port 9942 \ --source-version-mode Auto \ @@ -148,7 +148,7 @@ function init_wnd_ro() { ensure_relayer RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - ~/local_bridge_testing/bin/substrate-relay init-bridge westend-to-bridge-hub-rococo \ + /usr/local/bin/substrate-relay init-bridge westend-to-bridge-hub-rococo \ --source-host localhost \ --source-port 9945 \ --source-version-mode Auto \ @@ -162,7 +162,7 @@ function run_relay() { ensure_relayer RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - ~/local_bridge_testing/bin/substrate-relay relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ + /usr/local/bin/substrate-relay relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ --rococo-host localhost \ --rococo-port 9942 \ --rococo-version-mode Auto \