From 7e96715b8a129a8c32168654d9287b290753dcc9 Mon Sep 17 00:00:00 2001 From: Dino Pacandi Date: Thu, 27 Jul 2023 09:07:13 +0200 Subject: [PATCH] Fix rpc tests issues --- .github/workflows/release.yml | 2 +- README.md | 3 +-- rpc-tests/README.md | 2 +- rpc-tests/rpc-tests.toml | 6 ++---- rpc-tests/tests/0002-deploy-an-evm-contract.js | 4 ++-- rpc-tests/tests/0002-get-evm-contract-data.js | 4 ++-- rpc-tests/tests/0002-set-evm-contract-data.js | 4 ++-- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b4fd3f390..fa65561c46 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -183,7 +183,7 @@ jobs: - name: Copy zombinet testing binary run: | - wget https://github.com/paritytech/zombienet/releases/download/v1.3.35/zombienet-linux-x64 + wget https://github.com/paritytech/zombienet/releases/download/v1.3.63/zombienet-linux-x64 chmod +x ./zombienet-linux-x64 mv zombienet-linux-x64 rpc-tests/bin/zombienet-linux-x64 diff --git a/README.md b/README.md index 45620cc632..acf0b43fbd 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,7 @@ $ ./target/release/astar-collator \ --base-path \ --name \ --port 30333 \ - --ws-port 9944 \ - --rpc-port 9933 \ + --rpc-port 9944 \ --telemetry-url 'wss://telemetry.polkadot.io/submit/ 0' \ --rpc-cors all \ --collator diff --git a/rpc-tests/README.md b/rpc-tests/README.md index 53451e32a4..f73b178873 100644 --- a/rpc-tests/README.md +++ b/rpc-tests/README.md @@ -30,7 +30,7 @@ cp target/release/astar-collator rpc-tests/bin/astar-collator Download and copy latest polkadot binary from https://github.com/paritytech/polkadot/releases to rpc-tests/bin folder -Download and copy latest zombinet binary from https://github.com/paritytech/zombinet/releases to rpc-tests/bin folder +Download and copy latest zombienet binary from https://github.com/paritytech/zombienet/releases to rpc-tests/bin folder To start the test suite. diff --git a/rpc-tests/rpc-tests.toml b/rpc-tests/rpc-tests.toml index 119904aa2e..c9e55c1d58 100644 --- a/rpc-tests/rpc-tests.toml +++ b/rpc-tests/rpc-tests.toml @@ -25,8 +25,7 @@ cumulus_based = true [parachains.collator] name = "astar" command = "./astar-collator" - ws_port = 9944 - rpc_port = 8545 + rpc_port = 9944 args = [ "-l=xcm=trace", "--enable-evm-rpc" ] [[parachains]] @@ -37,8 +36,7 @@ cumulus_based = true [parachains.collator] name = "shiden" command = "./astar-collator" - ws_port = 9945 - rpc_port = 8546 + rpc_port = 9945 args = [ "-l=xcm=trace", "--enable-evm-rpc" ] [[hrmp_channels]] diff --git a/rpc-tests/tests/0002-deploy-an-evm-contract.js b/rpc-tests/tests/0002-deploy-an-evm-contract.js index c4007582a9..a7fde23d2d 100644 --- a/rpc-tests/tests/0002-deploy-an-evm-contract.js +++ b/rpc-tests/tests/0002-deploy-an-evm-contract.js @@ -1,6 +1,6 @@ async function run(nodeName, networkInfo, args) { - networkInfo.nodesByName["astar"].rpcPort = 8545 - networkInfo.nodesByName["shiden"].rpcPort = 8546 + networkInfo.nodesByName["astar"].rpcPort = 9944 + networkInfo.nodesByName["shiden"].rpcPort = 9945 const { rpcPort } = networkInfo.nodesByName[nodeName]; const { compiled } = await import("./compile.mjs"); diff --git a/rpc-tests/tests/0002-get-evm-contract-data.js b/rpc-tests/tests/0002-get-evm-contract-data.js index 9d4e28f9a8..1ac512c839 100644 --- a/rpc-tests/tests/0002-get-evm-contract-data.js +++ b/rpc-tests/tests/0002-get-evm-contract-data.js @@ -1,6 +1,6 @@ async function run(nodeName, networkInfo, args) { - networkInfo.nodesByName["astar"].rpcPort = 8545 - networkInfo.nodesByName["shiden"].rpcPort = 8546 + networkInfo.nodesByName["astar"].rpcPort = 9944 + networkInfo.nodesByName["shiden"].rpcPort = 9945 const {rpcPort} = networkInfo.nodesByName[nodeName]; const { compiled } = await import("./compile.mjs"); diff --git a/rpc-tests/tests/0002-set-evm-contract-data.js b/rpc-tests/tests/0002-set-evm-contract-data.js index 24bc1539ad..a82f4f40a2 100644 --- a/rpc-tests/tests/0002-set-evm-contract-data.js +++ b/rpc-tests/tests/0002-set-evm-contract-data.js @@ -1,6 +1,6 @@ async function run(nodeName, networkInfo, args) { - networkInfo.nodesByName["astar"].rpcPort = 8545 - networkInfo.nodesByName["shiden"].rpcPort = 8546 + networkInfo.nodesByName["astar"].rpcPort = 9944 + networkInfo.nodesByName["shiden"].rpcPort = 9945 const {rpcPort} = networkInfo.nodesByName[nodeName]; const { compiled } = await import("./compile.mjs");