Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bridge zombienet tests - move all test scripts to the same folder #3333

Merged
merged 7 commits into from
Feb 15, 2024
Merged

Bridge zombienet tests - move all test scripts to the same folder #3333

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7589b64
Remove migrated tests
serban300 Feb 15, 2024
c86b0a6
Move bridge hubs zombienet-related files
serban300 Feb 14, 2024
d34e1ea
fixes
serban300 Feb 15, 2024
2804ed6
artifacts fixes
serban300 Feb 15, 2024
8e3d094
Rename bridges/zombienet -> bridges/testing
serban300 Feb 15, 2024
c4e6c77
fix toml
serban300 Feb 15, 2024
68a6138
Rename helpers -> js-helpers
serban300 Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...hubs/bridge_hub_rococo_local_network.toml → ...tend/bridge_hub_rococo_local_network.toml
View file
Open in desktop
File renamed without changes.
0 ...ubs/bridge_hub_westend_local_network.toml → ...end/bridge_hub_westend_local_network.toml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cumulus/scripts/bridges_rococo_westend.sh → .../rococo-westend/bridges_rococo_westend.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@serban300 we reference this script in polkadot-sdk/cumulus/parachains/runtimes/bridge-hubs/README.md e.g. ./cumulus/scripts/bridges_rococo_westend.sh run-relay, could you please also fix/check that README.md that it is still working?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks ! Missed that. Fixed.


# import common functions
source "$(dirname "$0")"/bridges_common.sh
source "${BASH_SOURCE%/*}/../../utils/bridges.sh"

# Expected sovereign accounts.
#
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/environments/rococo-westend/helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

$POLKADOT_SDK_PATH/cumulus/scripts/bridges_rococo_westend.sh "$@"
$POLKADOT_SDK_PATH/bridges/zombienet/environments/rococo-westend/bridges_rococo_westend.sh "$@"
2 changes: 1 addition & 1 deletion bridges/zombienet/environments/rococo-westend/rococo-init.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: User is able to transfer WND from Westend Asset Hub to Rococo Asset Hub and back
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
Network: ./bridge_hub_rococo_local_network.toml
Creds: config

# ensure that initialization has completed
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/environments/rococo-westend/rococo.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: User is able to transfer WND from Westend Asset Hub to Rococo Asset Hub and back
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
Network: ./bridge_hub_rococo_local_network.toml
Creds: config

# relay is already started - let's wait until with-Westend GRANPDA pallet is initialized at Rococo
Expand Down
4 changes: 2 additions & 2 deletions bridges/zombienet/environments/rococo-westend/spawn.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ done
logs_dir=$TEST_DIR/logs
helper_script="${BASH_SOURCE%/*}/helper.sh"

rococo_def=$POLKADOT_SDK_PATH/cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
rococo_def=${BASH_SOURCE%/*}/bridge_hub_rococo_local_network.toml
start_zombienet $TEST_DIR $rococo_def rococo_dir rococo_pid
echo

westend_def=$POLKADOT_SDK_PATH/cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
westend_def=${BASH_SOURCE%/*}/bridge_hub_westend_local_network.toml
start_zombienet $TEST_DIR $westend_def westend_dir westend_pid
echo

Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/environments/rococo-westend/westend-init.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
Network: ./bridge_hub_westend_local_network.toml
Creds: config

# ensure that initialization has completed
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/environments/rococo-westend/westend.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
Network: ./bridge_hub_westend_local_network.toml
Creds: config

# relay is already started - let's wait until with-Rococo GRANPDA pallet is initialized at Westend
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/scripts/invoke-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

INVOKE_LOG=`mktemp -p $TEST_FOLDER invoke.XXXXX`

pushd $POLKADOT_SDK_PATH/cumulus/scripts
pushd $POLKADOT_SDK_PATH/bridges/zombienet/environments/rococo-westend
./bridges_rococo_westend.sh $1 >$INVOKE_LOG 2>&1
popd
2 changes: 1 addition & 1 deletion bridges/zombienet/scripts/start-relayer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

RELAY_LOG=`mktemp -p $TEST_FOLDER relay.XXXXX`

pushd $POLKADOT_SDK_PATH/cumulus/scripts
pushd $POLKADOT_SDK_PATH/bridges/zombienet/environments/rococo-westend
./bridges_rococo_westend.sh run-relay >$RELAY_LOG 2>&1&
popd
39 changes: 0 additions & 39 deletions bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bridges/zombienet/tests/0001-asset-transfer/roc-reaches-westend.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
Network: ../../environments/rococo-westend/bridge_hub_westend_local_network.toml
Creds: config

# send ROC to //Alice from Rococo AH to Westend AH
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/tests/0001-asset-transfer/wnd-reaches-rococo.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: User is able to transfer WND from Westend Asset Hub to Rococo Asset Hub and back
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
Network: ../../environments/rococo-westend/bridge_hub_rococo_local_network.toml
Creds: config

# send WND to //Alice from Westend AH to Rococo AH
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/tests/0001-asset-transfer/wroc-reaches-rococo.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
Network: ../../environments/rococo-westend/bridge_hub_westend_local_network.toml
Creds: config

# send wROC back to Alice from Westend AH to Rococo AH
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/tests/0001-asset-transfer/wwnd-reaches-westend.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
Network: ../../environments/rococo-westend/bridge_hub_westend_local_network.toml
Creds: config

# send wWND back to Alice from Rococo AH to Westend AH
Expand Down
26 changes: 0 additions & 26 deletions bridges/zombienet/tests/0002-mandatory-headers-synced-while-idle-rococo-to-westend.zndsl
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions bridges/zombienet/tests/0002-mandatory-headers-synced-while-idle-westend-to-rococo.zndsl
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bridges/zombienet/tests/0002-mandatory-headers-synced-while-idle/rococo-to-westend.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: While relayer is idle, we only sync mandatory Rococo (and a single Rococo BH) headers to Westend BH.
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
Network: ../../environments/rococo-westend/bridge_hub_westend_local_network.toml
Creds: config

# ensure that relayer is only syncing mandatory headers while idle. This includes both headers that were
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/tests/0002-mandatory-headers-synced-while-idle/westend-to-rococo.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: While relayer is idle, we only sync mandatory Westend (and a single Westend BH) headers to Rococo BH.
Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
Network: ../../environments/rococo-westend/bridge_hub_rococo_local_network.toml
Creds: config

# ensure that relayer is only syncing mandatory headers while idle. This includes both headers that were
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/tests/0003-required-headers-synced-while-active-rococo-to-westend.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: While relayer is active, we only sync mandatory and required Rococo (and Rococo BH) headers to Westend BH.
Network: ../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
Network: ../environments/rococo-westend/bridge_hub_westend_local_network.toml
Creds: config

# step 1: initialize Westend AH
Expand Down
2 changes: 1 addition & 1 deletion bridges/zombienet/tests/0003-required-headers-synced-while-active-westend-to-rococo.zndsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Description: While relayer is active, we only sync mandatory and required Westend (and Westend BH) headers to Rococo BH.
Network: ../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
Network: ../environments/rococo-westend/bridge_hub_rococo_local_network.toml
Creds: config

# step 1: initialize Rococo AH
Expand Down
2 changes: 1 addition & 1 deletion cumulus/scripts/bridges_common.sh → bridges/zombienet/utils/bridges.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function generate_hex_encoded_call_data() {
shift
echo "Input params: $@"

node $(dirname "$0")/generate_hex_encoded_call "$type" "$endpoint" "$output" "$@"
node ${BASH_SOURCE%/*}/../utils/generate_hex_encoded_call "$type" "$endpoint" "$output" "$@"
local retVal=$?

if [ $type != "check" ]; then
Expand Down
0 ...cripts/generate_hex_encoded_call/index.js → .../utils/generate_hex_encoded_call/index.js
View file
Open in desktop
File renamed without changes.
0 ...nerate_hex_encoded_call/package-lock.json → ...nerate_hex_encoded_call/package-lock.json
View file
Open in desktop
File renamed without changes.
0 ...ts/generate_hex_encoded_call/package.json → ...ls/generate_hex_encoded_call/package.json
View file
Open in desktop
File renamed without changes.
Loading