diff --git a/scripts/test/init_e2e.sh b/scripts/test/init_e2e.sh index 7f19bf067d..1f8d8fc4ac 100755 --- a/scripts/test/init_e2e.sh +++ b/scripts/test/init_e2e.sh @@ -9,8 +9,7 @@ GASPRICE="0.00002ulava" # Specs proposal echo ---- Specs proposal ---- -specs=$(get_all_specs) -lavad tx gov submit-legacy-proposal spec-add $specs --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE +lavad tx gov submit-legacy-proposal spec-add $(get_base_specs),./specs/testnet-2/specs/lava.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE sleep 6 # need to sleep because plan policies need the specs when setting chain policies verifications diff --git a/scripts/test/init_payment_e2e.sh b/scripts/test/init_payment_e2e.sh index 8adc74322c..30884777ea 100755 --- a/scripts/test/init_payment_e2e.sh +++ b/scripts/test/init_payment_e2e.sh @@ -8,8 +8,7 @@ source $__dir/../useful_commands.sh GASPRICE="0.00002ulava" # Specs proposal -specs=$(get_all_specs) -lavad tx gov submit-legacy-proposal spec-add $specs --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE +lavad tx gov submit-legacy-proposal spec-add $(get_base_specs),./specs/testnet-2/specs/lava.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block lavad tx gov deposit 1 100ulava -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block diff --git a/scripts/useful_commands.sh b/scripts/useful_commands.sh index ec75a35725..4dfcaba836 100755 --- a/scripts/useful_commands.sh +++ b/scripts/useful_commands.sh @@ -186,14 +186,12 @@ get_base_specs() { } get_all_specs() { - # Define the priority specs in order - local priority_specs=$(get_base_specs) - + local priority_specs=($(get_base_specs)) # Ensure it's an array local other_specs=() - # Get all json files and filter out the priority ones + find specs/{mainnet-1,testnet-2}/specs -name "*.json" > /tmp/specs_list.txt + while IFS= read -r file; do - # Skip if file is in priority_specs local is_priority=false for pspec in "${priority_specs[@]}"; do if [[ "./$file" == "$pspec" ]]; then @@ -202,12 +200,12 @@ get_all_specs() { fi done - # If not priority and not lava.json, add to other_specs if [[ "$is_priority" == "false" ]]; then other_specs+=("$file") fi - done < <(find specs/{mainnet-1,testnet-2}/specs -name "*.json") + done < /tmp/specs_list.txt + + rm /tmp/specs_list.txt - # Combine priority specs with other specs and join with commas (IFS=,; echo "${priority_specs[*]},${other_specs[*]}") } \ No newline at end of file diff --git a/testutil/e2e/protocolE2E.go b/testutil/e2e/protocolE2E.go index 541eb66a2c..85c1d28a63 100644 --- a/testutil/e2e/protocolE2E.go +++ b/testutil/e2e/protocolE2E.go @@ -53,7 +53,7 @@ const ( badgeserverConfigFolder = configFolder + "badgeserver" EmergencyModeStartLine = "+++++++++++ EMERGENCY MODE START ++++++++++" EmergencyModeEndLine = "+++++++++++ EMERGENCY MODE END ++++++++++" - NumberOfSpecsExpectedInE2E = 10 + NumberOfSpecsExpectedInE2E = 11 ) var (