From 305bb1537c87a45f01367455c7d8a4679e1f377e Mon Sep 17 00:00:00 2001 From: ducnt131 <62016666+anhductn2001@users.noreply.github.com> Date: Tue, 28 May 2024 15:06:22 +0700 Subject: [PATCH] chore(ci): set pull relayer image (#206) --- .github/workflows/e2e-test-workflow-call.yml | 2 +- tests/eibc_ack_error_test.go | 24 ++++++------ tests/eibc_corrupted_memo_test.go | 2 +- tests/eibc_fee_test.go | 2 +- tests/eibc_fulfillment_test.go | 40 ++++++++++---------- tests/eibc_invariant_test.go | 8 ++-- tests/eibc_nobalance_test.go | 2 +- tests/eibc_not_fulfillment_test.go | 8 ++-- tests/eibc_pfm_test.go | 8 ++-- tests/eibc_timeout_test.go | 14 +++---- tests/erc20_ibc_transfer_test.go | 2 +- tests/frozen_test.go | 16 ++++---- tests/ibc_finalize_block_test.go | 16 ++++---- tests/ibc_grace_period_test.go | 24 ++++++------ tests/ibc_pfm_test.go | 16 ++++---- tests/ibc_pfm_with_grace_period_test.go | 16 ++++---- tests/ibc_timeout_test.go | 4 +- tests/ibc_transfer_test.go | 4 +- tests/rollapp_genesis_event_test.go | 12 +++--- tests/rollapp_invariant_test.go | 8 ++-- tests/rollapp_upgrade_test.go | 8 ++-- tests/sequencer_invariant_test.go | 8 ++-- tests/setup.go | 13 +++++++ tests/upgrade_hub_test.go | 4 +- 24 files changed, 137 insertions(+), 124 deletions(-) diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml index e1f1be3e..2900ca62 100644 --- a/.github/workflows/e2e-test-workflow-call.yml +++ b/.github/workflows/e2e-test-workflow-call.yml @@ -20,7 +20,7 @@ on: description: "CI run on Relayer Repo" required: false type: string - default: relayerVersion + default: "main-dym" test: description: 'test name to run as standalone' required: false diff --git a/tests/eibc_ack_error_test.go b/tests/eibc_ack_error_test.go index e33a8537..5ae701d3 100644 --- a/tests/eibc_ack_error_test.go +++ b/tests/eibc_ack_error_test.go @@ -145,10 +145,10 @@ func TestEIBC_AckError_Dym_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -503,10 +503,10 @@ func TestEIBC_AckError_RA_Token_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -836,10 +836,10 @@ func TestEIBC_AckError_3rd_Party_Token_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1202,10 +1202,10 @@ func TestEIBC_AckError_Dym_Wasm(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1559,10 +1559,10 @@ func TestEIBC_AckError_RA_Token_Wasm(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1892,10 +1892,10 @@ func TestEIBC_AckError_3rd_Party_Token_Wasm(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_corrupted_memo_test.go b/tests/eibc_corrupted_memo_test.go index b4a62468..74ddb4ec 100644 --- a/tests/eibc_corrupted_memo_test.go +++ b/tests/eibc_corrupted_memo_test.go @@ -111,7 +111,7 @@ func TestEIBCCorruptedMemoNegative_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) const ibcPath = "ibc-path" ic := test.NewSetup(). diff --git a/tests/eibc_fee_test.go b/tests/eibc_fee_test.go index 64bcc083..d17e4509 100644 --- a/tests/eibc_fee_test.go +++ b/tests/eibc_fee_test.go @@ -111,7 +111,7 @@ func TestEIBCFeeTooHigh_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) const ibcPath = "ibc-path" ic := test.NewSetup(). diff --git a/tests/eibc_fulfillment_test.go b/tests/eibc_fulfillment_test.go index 85d328d3..c626a622 100644 --- a/tests/eibc_fulfillment_test.go +++ b/tests/eibc_fulfillment_test.go @@ -143,12 +143,12 @@ func TestEIBCFulfillOnOneRollApp_EVM(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -514,12 +514,12 @@ func TestEIBCFulfillOnOneRollApp_Wasm(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -886,11 +886,11 @@ func TestEIBCFulfillment_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1182,11 +1182,11 @@ func TestEIBCFulfillment_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1488,12 +1488,12 @@ func TestEIBCFulfillment_two_rollapps_EVM(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1890,17 +1890,17 @@ func TestEIBCFulfillment_ThirdParty_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) r3 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer3", network) ic := test.NewSetup(). @@ -2282,17 +2282,17 @@ func TestEIBCFulfillment_ThirdParty_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) // Relayer for gaia r3 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer3", network) ic := test.NewSetup(). @@ -2663,12 +2663,12 @@ func TestEIBCFulfillment_ignore_hub_to_RA_EVM(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -2916,12 +2916,12 @@ func TestEIBCFulfillment_ignore_hub_to_RA_Wasm(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_invariant_test.go b/tests/eibc_invariant_test.go index a5473e58..682a12de 100644 --- a/tests/eibc_invariant_test.go +++ b/tests/eibc_invariant_test.go @@ -142,11 +142,11 @@ func TestEIBCInvariant_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -498,11 +498,11 @@ func TestEIBCInvariant_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_nobalance_test.go b/tests/eibc_nobalance_test.go index 1fa580e3..49070d62 100644 --- a/tests/eibc_nobalance_test.go +++ b/tests/eibc_nobalance_test.go @@ -112,7 +112,7 @@ func TestEIBCNoBalanceToFulfillOrder_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) const ibcPath = "ibc-path" ic := test.NewSetup(). diff --git a/tests/eibc_not_fulfillment_test.go b/tests/eibc_not_fulfillment_test.go index 10aa721a..b36a7c5f 100644 --- a/tests/eibc_not_fulfillment_test.go +++ b/tests/eibc_not_fulfillment_test.go @@ -139,11 +139,11 @@ func TestEIBCNotFulfillment_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -401,11 +401,11 @@ func TestEIBCNotFulfillment_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_pfm_test.go b/tests/eibc_pfm_test.go index 77a8949a..b868f346 100644 --- a/tests/eibc_pfm_test.go +++ b/tests/eibc_pfm_test.go @@ -140,11 +140,11 @@ func TestEIBCPFM_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -428,11 +428,11 @@ func TestEIBCPFM_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_timeout_test.go b/tests/eibc_timeout_test.go index 6bd5fbde..b966966b 100644 --- a/tests/eibc_timeout_test.go +++ b/tests/eibc_timeout_test.go @@ -109,7 +109,7 @@ func TestEIBCTimeoutDymToRollapp_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) const ibcPath = "ibc-path" ic := test.NewSetup(). @@ -390,17 +390,17 @@ func TestEIBCTimeoutFulFillDymToRollapp_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) // relayer for rollapp gaia r3 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer3", network) const ibcPath = "ibc-path" @@ -771,17 +771,17 @@ func TestEIBCTimeoutFulFillDymToRollapp_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) // Relayer for gaia r3 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer3", network) ic := test.NewSetup(). diff --git a/tests/erc20_ibc_transfer_test.go b/tests/erc20_ibc_transfer_test.go index b08e605a..ba5fe993 100644 --- a/tests/erc20_ibc_transfer_test.go +++ b/tests/erc20_ibc_transfer_test.go @@ -113,7 +113,7 @@ func TestERC20HubToRollAppWithoutRegister_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) ic := test.NewSetup(). AddRollUp(dymension, rollapp1). diff --git a/tests/frozen_test.go b/tests/frozen_test.go index 8a9be68d..175b505b 100644 --- a/tests/frozen_test.go +++ b/tests/frozen_test.go @@ -145,11 +145,11 @@ func TestRollAppFreeze_EVM(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -474,11 +474,11 @@ func TestRollAppFreeze_Wasm(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -829,11 +829,11 @@ func TestOtherRollappNotAffected_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) s := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1242,11 +1242,11 @@ func TestOtherRollappNotAffected_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) s := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/ibc_finalize_block_test.go b/tests/ibc_finalize_block_test.go index 2c67d0f5..7d0030bd 100644 --- a/tests/ibc_finalize_block_test.go +++ b/tests/ibc_finalize_block_test.go @@ -90,7 +90,7 @@ func TestDymFinalizeBlock_OnRecvPacket_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -258,13 +258,13 @@ func TestDymFinalizeBlock_OnAckPacket_EVM(t *testing.T) { client, network := test.DockerSetup(t) r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -431,7 +431,7 @@ func TestDymFinalizeBlock_OnTimeOutPacket_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -598,7 +598,7 @@ func TestDymFinalizeBlock_OnRecvPacket_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -770,13 +770,13 @@ func TestDymFinalizeBlock_OnAckPacket_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -944,7 +944,7 @@ func TestDymFinalizeBlock_OnTimeOutPacket_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/ibc_grace_period_test.go b/tests/ibc_grace_period_test.go index 234ac914..71ecdccc 100644 --- a/tests/ibc_grace_period_test.go +++ b/tests/ibc_grace_period_test.go @@ -138,11 +138,11 @@ func TestIBCGracePeriodCompliance_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -417,11 +417,11 @@ func TestIBCGracePeriodCompliance_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -696,11 +696,11 @@ func TestDelayedAck_NoFinalizedStates_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -953,11 +953,11 @@ func TestDelayedAck_NoFinalizedStates_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1210,11 +1210,11 @@ func TestDelayedAck_RelayerDown_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1482,11 +1482,11 @@ func TestDelayedAck_RelayerDown_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/ibc_pfm_test.go b/tests/ibc_pfm_test.go index 408f9f85..d0c1fb77 100644 --- a/tests/ibc_pfm_test.go +++ b/tests/ibc_pfm_test.go @@ -93,13 +93,13 @@ func TestIBCTransferMultiHop_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -343,13 +343,13 @@ func TestIBCTransferMultiHop_Wasm(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -593,13 +593,13 @@ func TestIBCTransferGaiaToRollApp_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -839,13 +839,13 @@ func TestIBCTransferGaiaToRollApp_Wasm(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/ibc_pfm_with_grace_period_test.go b/tests/ibc_pfm_with_grace_period_test.go index 81a03891..9fffe3e4 100644 --- a/tests/ibc_pfm_with_grace_period_test.go +++ b/tests/ibc_pfm_with_grace_period_test.go @@ -120,13 +120,13 @@ func TestIBCPFMWithGracePeriod_EVM(t *testing.T) { r := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -412,13 +412,13 @@ func TestIBCPFMWithGracePeriod_Wasm(t *testing.T) { r := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -727,11 +727,11 @@ func TestIBCPFM_RollApp1To2WithErc20_EVM(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -1081,11 +1081,11 @@ func TestIBCPFM_RollApp1To2WithOutErc20_Wasm(t *testing.T) { // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/ibc_timeout_test.go b/tests/ibc_timeout_test.go index a3bd1236..34770b74 100644 --- a/tests/ibc_timeout_test.go +++ b/tests/ibc_timeout_test.go @@ -110,7 +110,7 @@ func TestIBCTransferTimeout_EVM(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -343,7 +343,7 @@ func TestIBCTransferTimeout_Wasm(t *testing.T) { // Relayer Factory client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/ibc_transfer_test.go b/tests/ibc_transfer_test.go index 47e8a580..bb868ca4 100644 --- a/tests/ibc_transfer_test.go +++ b/tests/ibc_transfer_test.go @@ -85,7 +85,7 @@ func TestIBCTransferSuccess_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -266,7 +266,7 @@ func TestIBCTransferSuccess_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/rollapp_genesis_event_test.go b/tests/rollapp_genesis_event_test.go index 8a377ce2..c09f4355 100644 --- a/tests/rollapp_genesis_event_test.go +++ b/tests/rollapp_genesis_event_test.go @@ -91,7 +91,7 @@ func TestRollappGenesisEvent_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -262,7 +262,7 @@ func TestTransferRollAppTriggerGenesis_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -434,7 +434,7 @@ func TestTransferRollAppTriggerGenesis_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -599,7 +599,7 @@ func TestRollAppTransferHubTriggerGenesis_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -771,7 +771,7 @@ func TestRollAppTransferHubTriggerGenesis_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -1317,7 +1317,7 @@ func TestHubTransferHubTriggerGenesis_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/rollapp_invariant_test.go b/tests/rollapp_invariant_test.go index 25101615..30c8ca66 100644 --- a/tests/rollapp_invariant_test.go +++ b/tests/rollapp_invariant_test.go @@ -134,11 +134,11 @@ func TestRollappInvariant_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -397,11 +397,11 @@ func TestRollappInvariant_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/rollapp_upgrade_test.go b/tests/rollapp_upgrade_test.go index ea2159b3..aaae68fb 100644 --- a/tests/rollapp_upgrade_test.go +++ b/tests/rollapp_upgrade_test.go @@ -92,7 +92,7 @@ func TestRollappUpgradeNonStateBreaking_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -293,7 +293,7 @@ func TestRollappUpgradeNonStateBreaking_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -494,7 +494,7 @@ func TestRollapp_EVM_Upgrade(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -746,7 +746,7 @@ func TestRollapp_Wasm_Upgrade(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/sequencer_invariant_test.go b/tests/sequencer_invariant_test.go index ddaef829..cb75eade 100644 --- a/tests/sequencer_invariant_test.go +++ b/tests/sequencer_invariant_test.go @@ -134,11 +134,11 @@ func TestSequencerInvariant_EVM(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -400,11 +400,11 @@ func TestSequencerInvariant_Wasm(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/setup.go b/tests/setup.go index bc3901ed..843a3d9d 100644 --- a/tests/setup.go +++ b/tests/setup.go @@ -66,6 +66,8 @@ var ( upgradeName, upgradeEVMName, upgradeWasmName = GetUpgradeName() + pullRelayerImage = GetPullRelayerImage() + dymensionImage = ibc.DockerImage{ Repository: DymensionMainRepo, Version: dymensionVersion, @@ -337,6 +339,17 @@ func GetUpgradeName() (upgradeName, upgradeEVMName, upgradeWasmName string) { return upgradeName, upgradeEVMName, upgradeWasmName } +func GetPullRelayerImage() (pullRelayerImage bool) { + pull, found := os.LookupEnv("RELAYER_CI") + if !found { + pullRelayerImage = true + } + if pull == "e2e" { + pullRelayerImage = false + } + return pullRelayerImage +} + func encodingConfig() *simappparams.EncodingConfig { cfg := cosmos.DefaultEncoding() diff --git a/tests/upgrade_hub_test.go b/tests/upgrade_hub_test.go index 5d04b867..ea4051b3 100644 --- a/tests/upgrade_hub_test.go +++ b/tests/upgrade_hub_test.go @@ -145,11 +145,11 @@ func TestHubUpgrade(t *testing.T) { client, network := test.DockerSetup(t) // relayer for rollapp 1 r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage), ).Build(t, client, "relayer2", network) ic := test.NewSetup().AddRollUp(dymension, rollapp1, rollapp2).