From 49cb591504b5630e22c9d4e06b8ec84b5ab34bf3 Mon Sep 17 00:00:00 2001
From: Serban Iorga <serban@parity.io>
Date: Wed, 12 Feb 2025 12:05:31 +0200
Subject: [PATCH] use rpc_port in bridge tests (#588)

Use `rpc_port` instead of `ws_port` in bridge tests since `ws_port` was
deprecated in zombienet `1.3.120`.

- [x] Does not require a CHANGELOG entry
---
 .../bridge_hub_kusama_local_network.toml       | 18 ++++++------------
 .../bridge_hub_polkadot_local_network.toml     | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml
index fd0b90a565..6f392194ac 100644
--- a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml
+++ b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml
@@ -10,22 +10,19 @@ chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY_FOR_KUSAMA}} {% raw %} {{chainName
 [[relaychain.nodes]]
 name = "alice"
 validator = true
-rpc_port = 9935
-ws_port = 9945
+rpc_port = 9945
 balance = 2000000000000
 
 [[relaychain.nodes]]
 name = "bob"
 validator = true
-rpc_port = 9936
-ws_port = 9946
+rpc_port = 9946
 balance = 2000000000000
 
 [[relaychain.nodes]]
 name = "charlie"
 validator = true
-rpc_port = 9937
-ws_port = 9947
+rpc_port = 9947
 balance = 2000000000000
 
 [[parachains]]
@@ -36,8 +33,7 @@ cumulus_based = true
 
 [[parachains.collators]]
 name = "asset-hub-kusama-collator-1"
-rpc_port = 9011
-ws_port = 9010
+rpc_port = 9010
 command = "{{POLKADOT_PARACHAIN_BINARY}}"
 args = ["-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"]
 
@@ -57,8 +53,7 @@ cumulus_based = true
 name = "bridge-hub-kusama-collator-1"
 validator = true
 command = "{{POLKADOT_PARACHAIN_BINARY}}"
-rpc_port = 8935
-ws_port = 8945
+rpc_port = 8945
 args = [
 	"-lparachain=debug,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace",
 ]
@@ -68,8 +63,7 @@ args = [
 name = "bridge-hub-kusama-collator-2"
 validator = true
 command = "{{POLKADOT_PARACHAIN_BINARY}}"
-rpc_port = 8936
-ws_port = 8946
+rpc_port = 8946
 args = [
 	"-lparachain=trace,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace",
 ]
diff --git a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml
index 2724921739..1dcf7c1bf7 100644
--- a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml
+++ b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml
@@ -10,22 +10,19 @@ chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY_FOR_POLKADOT}} {% raw %} {{chainNa
 [[relaychain.nodes]]
 name = "alice"
 validator = true
-rpc_port = 9932
-ws_port = 9942
+rpc_port = 9942
 balance = 2000000000000
 
 [[relaychain.nodes]]
 name = "bob"
 validator = true
-rpc_port = 9933
-ws_port = 9943
+rpc_port = 9943
 balance = 2000000000000
 
 [[relaychain.nodes]]
 name = "charlie"
 validator = true
-rpc_port = 9934
-ws_port = 9944
+rpc_port = 9944
 balance = 2000000000000
 
 [[parachains]]
@@ -36,8 +33,7 @@ cumulus_based = true
 
 [[parachains.collators]]
 name = "asset-hub-polkadot-collator-1"
-rpc_port = 9911
-ws_port = 9910
+rpc_port = 9910
 command = "{{POLKADOT_PARACHAIN_BINARY}}"
 args = ["-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"]
 
@@ -56,8 +52,7 @@ cumulus_based = true
 name = "bridge-hub-polkadot-collator-1"
 validator = true
 command = "{{POLKADOT_PARACHAIN_BINARY}}"
-rpc_port = 8933
-ws_port = 8943
+rpc_port = 8943
 args = [
 	"-lparachain=debug,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace",
 ]
@@ -66,8 +61,7 @@ args = [
 name = "bridge-hub-polkadot-collator-2"
 validator = true
 command = "{{POLKADOT_PARACHAIN_BINARY}}"
-rpc_port = 8934
-ws_port = 8944
+rpc_port = 8944
 args = [
 	"-lparachain=trace,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace",
 ]