fix tests

agglayer · Feb 28, 2025 · 8783303 · 8783303
1 parent 2fdb0ea
commit 8783303
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/test/bats/helpers/lxly-bridge.bash b/test/bats/helpers/lxly-bridge.bash
@@ -90,11 +90,10 @@ function bridge_asset() {
 }
 
 function get_bridge() {
-    local aggkit_node_url=$1
-    local network_id=$2
-    local expected_tx_hash=$3
-    local max_attempts=$4
-    local poll_frequency=$5
+    local network_id="$1"
+    local expected_tx_hash="$2"
+    local max_attempts="$3"
+    local poll_frequency="$4"
 
     local attempt=0
 
@@ -320,10 +319,9 @@ function check_claim_revert_code() {
 }
 
 function wait_for_expected_token() {
-    local aggkit_node_url="$1"
-    local expected_origin_token="$2"
-    local max_attempts="$3"
-    local poll_frequency="$4"
+    local expected_origin_token="$1"
+    local max_attempts="$2"
+    local poll_frequency="$3"
 
     local attempt=0
     local token_mappings_result
@@ -359,17 +357,16 @@ function wait_for_expected_token() {
 }
 
 function get_claim() {
-    local aggkit_node_url=$1
-    local l1_rpc_network_id=$2
-    local expected_global_index=$3
-    local max_attempts=$4
-    local poll_frequency=$5
+    local network_id="$1"
+    local expected_global_index="$2"
+    local max_attempts="$3"
+    local poll_frequency="$4"
     local attempt=0
 
     while true; do
         ((attempt++))
         log "🔍 Attempt $attempt: fetching claims from the RPC ("$aggkit_node_url")..."
-        claims_result=$(cast rpc --rpc-url "$aggkit_node_url" "bridge_getClaims" "$l1_rpc_network_id")
+        claims_result=$(cast rpc --rpc-url "$aggkit_node_url" "bridge_getClaims" "$network_id")
         log "------ claims_result ------"
         log "$claims_result"
 

diff --git a/test/bats/pp/bridge-e2e.bats b/test/bats/pp/bridge-e2e.bats
@@ -40,7 +40,7 @@ setup() {
 
     readonly l1_rpc_url=${L1_ETH_RPC_URL:-"$(kurtosis port print $enclave el-1-geth-lighthouse rpc)"}
     readonly bridge_api_url=${BRIDGE_API_URL:-"$(kurtosis port print $enclave zkevm-bridge-service-001 rpc)"}
-    readonly aggkit_node_url=${AGGKIT_NODE_URL:-$"(kurtosis port print $enclave cdk-node-001 rpc)"}
+    readonly aggkit_node_url=${AGGKIT_NODE_URL:-"$(kurtosis port print $enclave cdk-node-001 rpc)"}
 
     readonly dry_run=${DRY_RUN:-"false"}
     readonly l1_rpc_network_id=$(cast call --rpc-url $l1_rpc_url $bridge_addr 'networkID() (uint32)')
@@ -66,9 +66,7 @@ setup() {
     local bridge_tx_hash=$output
 
     echo "------- bridge_getBridges API testcase"
-    local aggkit_node_url
-    aggkit_node_url="$(kurtosis port print "$enclave" cdk-node-001 rpc)"
-    run get_bridge "$aggkit_node_url" "$l1_rpc_network_id" "$bridge_tx_hash" 10 3
+    run get_bridge "$l1_rpc_network_id" "$bridge_tx_hash" 10 3
     assert_success
     local bridge
     bridge="$output"
@@ -154,7 +152,7 @@ setup() {
 
     # Validate the bridge_getClaims API
     echo "------- bridge_getClaims API testcase --------"
-    run get_claim "$aggkit_node_url" "$l2_rpc_network_id" "$global_index" 10 3
+    run get_claim "$l2_rpc_network_id" "$global_index" 10 3
     assert_success
 
     local origin_network="$(echo "$output" | jq -r '.origin_network')"
@@ -249,7 +247,7 @@ setup() {
     run claim_tx_hash "$timeout" "$bridge_tx_hash" "$destination_addr" "$l2_rpc_url" "$bridge_api_url"
     assert_success
 
-    run wait_for_expected_token "$aggkit_node_url" "$l1_erc20_addr" 10 2
+    run wait_for_expected_token "$l1_erc20_addr" 10 2
     assert_success
     local token_mappings_result=$output