From cb93bc567182f6925467963b6a49d214a00cb013 Mon Sep 17 00:00:00 2001 From: Nguyen Thanh Nhan | Decentrio Date: Tue, 28 May 2024 10:05:15 +0700 Subject: [PATCH 1/4] test: rollapp-genesis check ibc transfer hub to rollapp when only rollapp side gone through genesis event (#189) --- Makefile | 6 + tests/rollapp_genesis_event_test.go | 369 ++++++++++++++++++++++++++++ 2 files changed, 375 insertions(+) diff --git a/Makefile b/Makefile index 7b59ffe5..578bd901 100644 --- a/Makefile +++ b/Makefile @@ -140,6 +140,9 @@ e2e-test-rollapp_genesis_transfer_rollapp_to_hub_with_trigger_rollapp_evm: clean e2e-test-rollapp_genesis_transfer_rollapp_to_hub_with_trigger_hub_evm: clean-e2e cd tests && go test -timeout=25m -race -v -run TestRollAppTransferHubTriggerGenesis_EVM . +e2e-test-rollapp_genesis_transfer_hub_to_rollapp_with_trigger_rollapp_evm: clean-e2e + cd tests && go test -timeout=25m -race -v -run TestHubTransferRollAppTriggerGenesis_EVM . + e2e-test-rollapp_genesis_transfer_hub_to_rollapp_with_trigger_hub_evm: clean-e2e cd tests && go test -timeout=25m -race -v -run TestHubTransferHubTriggerGenesis_EVM . @@ -252,6 +255,9 @@ e2e-test-rollapp_genesis_transfer_rollapp_to_hub_with_trigger_hub_wasm: clean-e2 e2e-test-rollapp-upgrade-wasm: clean-e2e cd tests && go test -timeout=25m -race -v -run TestRollapp_Wasm_Upgrade . +e2e-test-rollapp_genesis_transfer_hub_to_rollapp_with_trigger_rollapp_wasm: clean-e2e + cd tests && go test -timeout=25m -race -v -run TestHubTransferRollAppTriggerGenesis_Wasm . + e2e-test-rollapp_genesis_transfer_back_and_forth_with_trigger_both_wasm: clean-e2e cd tests && go test -timeout=25m -race -v -run TestTransferTriggerGenesisBoth_Wasm . diff --git a/tests/rollapp_genesis_event_test.go b/tests/rollapp_genesis_event_test.go index 451f9055..fdbc6d65 100644 --- a/tests/rollapp_genesis_event_test.go +++ b/tests/rollapp_genesis_event_test.go @@ -869,6 +869,375 @@ func TestRollAppTransferHubTriggerGenesis_Wasm(t *testing.T) { ) } +func TestHubTransferRollAppTriggerGenesis_EVM(t *testing.T) { + if testing.Short() { + t.Skip() + } + + ctx := context.Background() + + // setup config for rollapp 1 + configFileOverrides := make(map[string]any) + dymintTomlOverrides := make(testutil.Toml) + dymintTomlOverrides["settlement_layer"] = "dymension" + dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" + dymintTomlOverrides["settlement_gas_prices"] = "0adym" + dymintTomlOverrides["max_idle_time"] = "3s" + dymintTomlOverrides["max_proof_time"] = "500ms" + dymintTomlOverrides["batch_submit_max_time"] = "100s" + + configFileOverrides["config/dymint.toml"] = dymintTomlOverrides + + extraFlags := map[string]interface{}{"genesis-accounts-path": true} + + // Create chain factory with dymension + numHubVals := 1 + numHubFullNodes := 1 + numRollAppFn := 0 + numRollAppVals := 1 + + cf := test.NewBuiltinChainFactory(zaptest.NewLogger(t), []*test.ChainSpec{ + { + Name: "rollapp1", + ChainConfig: ibc.ChainConfig{ + Type: "rollapp-dym", + Name: "rollapp-temp", + ChainID: "rollappevm_1234-1", + Images: []ibc.DockerImage{rollappEVMImage}, + Bin: "rollappd", + Bech32Prefix: "ethm", + Denom: "urax", + CoinType: "60", + GasPrices: "0.0urax", + GasAdjustment: 1.1, + TrustingPeriod: "112h", + EncodingConfig: encodingConfig(), + NoHostMount: false, + ModifyGenesis: modifyRollappEVMGenesis(rollappEVMGenesisKV), + ConfigFileOverrides: configFileOverrides, + }, + NumValidators: &numRollAppVals, + NumFullNodes: &numRollAppFn, + }, + { + Name: "dymension-hub", + ChainConfig: dymensionConfig, + NumValidators: &numHubVals, + NumFullNodes: &numHubFullNodes, + ExtraFlags: extraFlags, + }, + }) + + // Get chains from the chain factory + chains, err := cf.Chains(t.Name()) + require.NoError(t, err) + + rollapp1 := chains[0].(*dym_rollapp.DymRollApp) + dymension := chains[1].(*dym_hub.DymHub) + + // Relayer Factory + client, network := test.DockerSetup(t) + + r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), + relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + ).Build(t, client, "relayer", network) + + ic := test.NewSetup(). + AddRollUp(dymension, rollapp1). + AddRelayer(r, "relayer"). + AddLink(test.InterchainLink{ + Chain1: dymension, + Chain2: rollapp1, + Relayer: r, + Path: ibcPath, + }) + + rep := testreporter.NewNopReporter() + eRep := rep.RelayerExecReporter(t) + + err = ic.Build(ctx, eRep, test.InterchainBuildOptions{ + TestName: t.Name(), + Client: client, + NetworkID: network, + SkipPathCreation: true, + + // This can be used to write to the block database which will index all block data e.g. txs, msgs, events, etc. + // BlockDatabaseFile: test.DefaultBlockDatabaseFilepath(), + }) + require.NoError(t, err) + + CreateChannel(ctx, t, r, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath) + + // Create some user accounts on both chains + users := test.GetAndFundTestUsers(t, ctx, t.Name(), walletAmount, dymension, rollapp1) + + // Get our Bech32 encoded user addresses + dymensionUser, rollappUser := users[0], users[1] + + dymensionUserAddr := dymensionUser.FormattedAddress() + rollappUserAddr := rollappUser.FormattedAddress() + + // Get original account balances + dymensionOrigBal, err := dymension.GetBalance(ctx, dymensionUserAddr, dymension.Config().Denom) + require.NoError(t, err) + require.Equal(t, walletAmount, dymensionOrigBal) + + rollappOrigBal, err := rollapp1.GetBalance(ctx, rollappUserAddr, rollapp1.Config().Denom) + require.NoError(t, err) + require.Equal(t, walletAmount, rollappOrigBal) + + channel, err := ibc.GetTransferChannel(ctx, r, eRep, dymension.Config().ChainID, rollapp1.Config().ChainID) + require.NoError(t, err) + require.NoError(t, err) + registerGenesisEventTriggerer(t, rollapp1.CosmosChain, rollappUser.KeyName(), rollappUserAddr, "hubgenesis", "GenesisTriggererAllowlist") + + _, err = rollapp1.Validators[0].ExecTx(ctx, rollappUserAddr, "hubgenesis", "genesis-event", dymension.GetChainID(), channel.ChannelID) + require.NoError(t, err) + + hubGenesisState, err := rollapp1.GetNode().QueryHubGenesisState(ctx) + require.NoError(t, err) + + escrowAddress, err := rollapp1.Validators[0].QueryEscrowAddress(ctx, channel.PortID, channel.ChannelID) + require.NoError(t, err) + testutil.AssertBalance(t, ctx, rollapp1, escrowAddress, rollapp1.Config().Denom, hubGenesisState.GenesisTokens.AmountOf(rollapp1.Config().Denom)) + + err = r.StartRelayer(ctx, eRep, ibcPath) + require.NoError(t, err) + + rollappTokenDenom := transfertypes.GetPrefixedDenom(channel.Counterparty.PortID, channel.ChannelID, rollapp1.Config().Denom) + rollappIBCDenom := transfertypes.ParseDenomTrace(rollappTokenDenom).IBCDenom() + + transferData := ibc.WalletData{ + Address: rollappUserAddr, + Denom: rollappIBCDenom, + Amount: transferAmount, + } + // get val0 address + val0Addr, err := dymension.Validators[0].AccountKeyBech32(ctx, "validator") + require.NoError(t, err) + + rollappHeight, err := rollapp1.GetNode().Height(ctx) + require.NoError(t, err) + + // check balance of ibc token on rollapp genesis account on hub + testutil.AssertBalance(t, ctx, dymension, val0Addr, rollappIBCDenom, zeroBal) + + // ibc transfer from genesis account on hub -> rollapp + _, err = dymension.Validators[0].SendIBCTransfer(ctx, channel.ChannelID, "validator", transferData, ibc.TransferOptions{}) + require.Error(t, err) + + testutil.AssertBalance(t, ctx, dymension, val0Addr, rollappIBCDenom, zeroBal) + // Assert balance was updated on the rollapp + testutil.AssertBalance(t, ctx, rollapp1, rollappUserAddr, rollapp1.Config().Denom, walletAmount) + + // wait until the packet is finalized + isFinalized, err := dymension.WaitUntilRollappHeightIsFinalized(ctx, rollapp1.GetChainID(), rollappHeight, 300) + require.NoError(t, err) + require.True(t, isFinalized) + + // Assert funds were returned to the sender after the timeout has occured + testutil.AssertBalance(t, ctx, rollapp1, rollappUserAddr, rollapp1.Config().Denom, walletAmount) + testutil.AssertBalance(t, ctx, dymension, val0Addr, rollappIBCDenom, zeroBal) + testutil.AssertBalance(t, ctx, rollapp1, escrowAddress, rollapp1.Config().Denom, hubGenesisState.GenesisTokens.AmountOf(rollapp1.Config().Denom)) + t.Cleanup( + func() { + err := r.StopRelayer(ctx, eRep) + if err != nil { + t.Logf("an error occurred while stopping the relayer: %s", err) + } + }, + ) +} + +func TestHubTransferRollAppTriggerGenesis_Wasm(t *testing.T) { + if testing.Short() { + t.Skip() + } + + ctx := context.Background() + + // setup config for rollapp 1 + configFileOverrides := make(map[string]any) + dymintTomlOverrides := make(testutil.Toml) + dymintTomlOverrides["settlement_layer"] = "dymension" + dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + dymintTomlOverrides["rollapp_id"] = "rollappwasm_1234-1" + dymintTomlOverrides["settlement_gas_prices"] = "0adym" + dymintTomlOverrides["max_idle_time"] = "3s" + dymintTomlOverrides["max_proof_time"] = "500ms" + dymintTomlOverrides["batch_submit_max_time"] = "100s" + + configFileOverrides["config/dymint.toml"] = dymintTomlOverrides + + extraFlags := map[string]interface{}{"genesis-accounts-path": true} + + modifyGenesisKV := []cosmos.GenesisKV{ + { + Key: "app_state.gov.voting_params.voting_period", + Value: "30s", + }, + } + + // Create chain factory with dymension + numHubVals := 1 + numHubFullNodes := 1 + numRollAppFn := 0 + numRollAppVals := 1 + + cf := test.NewBuiltinChainFactory(zaptest.NewLogger(t), []*test.ChainSpec{ + { + Name: "rollapp1", + ChainConfig: ibc.ChainConfig{ + Type: "rollapp-dym", + Name: "rollapp-temp", + ChainID: "rollappwasm_1234-1", + Images: []ibc.DockerImage{rollappWasmImage}, + Bin: "rollappd", + Bech32Prefix: "rol", + Denom: "urax", + CoinType: "118", + GasPrices: "0.0urax", + GasAdjustment: 1.1, + TrustingPeriod: "112h", + EncodingConfig: encodingConfig(), + NoHostMount: false, + ModifyGenesis: modifyRollappWasmGenesis(modifyGenesisKV), + ConfigFileOverrides: configFileOverrides, + }, + NumValidators: &numRollAppVals, + NumFullNodes: &numRollAppFn, + }, + { + Name: "dymension-hub", + ChainConfig: dymensionConfig, + NumValidators: &numHubVals, + NumFullNodes: &numHubFullNodes, + ExtraFlags: extraFlags, + }, + }) + + // Get chains from the chain factory + chains, err := cf.Chains(t.Name()) + require.NoError(t, err) + + rollapp1 := chains[0].(*dym_rollapp.DymRollApp) + dymension := chains[1].(*dym_hub.DymHub) + + // Relayer Factory + client, network := test.DockerSetup(t) + + r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), + relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + ).Build(t, client, "relayer", network) + + ic := test.NewSetup(). + AddRollUp(dymension, rollapp1). + AddRelayer(r, "relayer"). + AddLink(test.InterchainLink{ + Chain1: dymension, + Chain2: rollapp1, + Relayer: r, + Path: ibcPath, + }) + + rep := testreporter.NewNopReporter() + eRep := rep.RelayerExecReporter(t) + + err = ic.Build(ctx, eRep, test.InterchainBuildOptions{ + TestName: t.Name(), + Client: client, + NetworkID: network, + SkipPathCreation: true, + + // This can be used to write to the block database which will index all block data e.g. txs, msgs, events, etc. + // BlockDatabaseFile: test.DefaultBlockDatabaseFilepath(), + }) + require.NoError(t, err) + + CreateChannel(ctx, t, r, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath) + + // Create some user accounts on both chains + users := test.GetAndFundTestUsers(t, ctx, t.Name(), walletAmount, dymension, rollapp1) + + // Get our Bech32 encoded user addresses + dymensionUser, rollappUser := users[0], users[1] + + dymensionUserAddr := dymensionUser.FormattedAddress() + rollappUserAddr := rollappUser.FormattedAddress() + + // Get original account balances + dymensionOrigBal, err := dymension.GetBalance(ctx, dymensionUserAddr, dymension.Config().Denom) + require.NoError(t, err) + require.Equal(t, walletAmount, dymensionOrigBal) + + rollappOrigBal, err := rollapp1.GetBalance(ctx, rollappUserAddr, rollapp1.Config().Denom) + require.NoError(t, err) + require.Equal(t, walletAmount, rollappOrigBal) + + channel, err := ibc.GetTransferChannel(ctx, r, eRep, dymension.Config().ChainID, rollapp1.Config().ChainID) + require.NoError(t, err) + require.NoError(t, err) + registerGenesisEventTriggerer(t, rollapp1.CosmosChain, rollappUser.KeyName(), rollappUserAddr, "hubgenesis", "GenesisTriggererAllowlist") + + _, err = rollapp1.Validators[0].ExecTx(ctx, rollappUserAddr, "hubgenesis", "genesis-event", dymension.GetChainID(), channel.ChannelID) + require.NoError(t, err) + + hubGenesisState, err := rollapp1.GetNode().QueryHubGenesisState(ctx) + require.NoError(t, err) + + escrowAddress, err := rollapp1.Validators[0].QueryEscrowAddress(ctx, channel.PortID, channel.ChannelID) + require.NoError(t, err) + testutil.AssertBalance(t, ctx, rollapp1, escrowAddress, rollapp1.Config().Denom, hubGenesisState.GenesisTokens.AmountOf(rollapp1.Config().Denom)) + + err = r.StartRelayer(ctx, eRep, ibcPath) + require.NoError(t, err) + + rollappTokenDenom := transfertypes.GetPrefixedDenom(channel.Counterparty.PortID, channel.ChannelID, rollapp1.Config().Denom) + rollappIBCDenom := transfertypes.ParseDenomTrace(rollappTokenDenom).IBCDenom() + + transferData := ibc.WalletData{ + Address: rollappUserAddr, + Denom: rollappIBCDenom, + Amount: transferAmount, + } + // get val0 address + val0Addr, err := dymension.Validators[0].AccountKeyBech32(ctx, "validator") + require.NoError(t, err) + + rollappHeight, err := rollapp1.GetNode().Height(ctx) + require.NoError(t, err) + + // check balance of ibc token on rollapp genesis account on hub + testutil.AssertBalance(t, ctx, dymension, val0Addr, rollappIBCDenom, zeroBal) + + // ibc transfer from genesis account on hub -> rollapp + _, err = dymension.Validators[0].SendIBCTransfer(ctx, channel.ChannelID, "validator", transferData, ibc.TransferOptions{}) + require.Error(t, err) + + testutil.AssertBalance(t, ctx, dymension, val0Addr, rollappIBCDenom, zeroBal) + // Assert balance was updated on the rollapp + testutil.AssertBalance(t, ctx, rollapp1, rollappUserAddr, rollapp1.Config().Denom, walletAmount) + + // wait until the packet is finalized + isFinalized, err := dymension.WaitUntilRollappHeightIsFinalized(ctx, rollapp1.GetChainID(), rollappHeight, 300) + require.NoError(t, err) + require.True(t, isFinalized) + + // Assert funds were returned to the sender after the timeout has occured + testutil.AssertBalance(t, ctx, rollapp1, rollappUserAddr, rollapp1.Config().Denom, walletAmount) + testutil.AssertBalance(t, ctx, dymension, val0Addr, rollappIBCDenom, zeroBal) + testutil.AssertBalance(t, ctx, rollapp1, escrowAddress, rollapp1.Config().Denom, hubGenesisState.GenesisTokens.AmountOf(rollapp1.Config().Denom)) + t.Cleanup( + func() { + err := r.StopRelayer(ctx, eRep) + if err != nil { + t.Logf("an error occurred while stopping the relayer: %s", err) + } + }, + ) +} + func TestHubTransferHubTriggerGenesis_EVM(t *testing.T) { if testing.Short() { t.Skip() From 2d163fa121b4bc03bb71abb54e458726f11fa215 Mon Sep 17 00:00:00 2001 From: ducnt131 <62016666+anhductn2001@users.noreply.github.com> Date: Tue, 28 May 2024 11:51:52 +0700 Subject: [PATCH 2/4] chore: set params and rollapp-evm image (#201) Co-authored-by: hoangdv2429 Co-authored-by: ThanhNhann --- tests/disconnection_test.go | 12 +- tests/eibc_fulfillment_test.go | 330 +++++++++++----------------- tests/eibc_invariant_test.go | 31 +-- tests/eibc_pfm_test.go | 32 +-- tests/eibc_timeout_test.go | 31 +-- tests/erc20_ibc_transfer_test.go | 11 +- tests/frozen_test.go | 53 +++-- tests/ibc_finalize_block_test.go | 10 +- tests/rollapp_genesis_event_test.go | 4 +- tests/upgrade_hub_test.go | 34 ++- 10 files changed, 227 insertions(+), 321 deletions(-) diff --git a/tests/disconnection_test.go b/tests/disconnection_test.go index a79593c5..403576c0 100644 --- a/tests/disconnection_test.go +++ b/tests/disconnection_test.go @@ -118,7 +118,11 @@ func TestDisconnection_EVM(t *testing.T) { dymintTomlOverrides["settlement_gas_prices"] = "0adym" dymintTomlOverrides["max_idle_time"] = "3s" dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + dymintTomlOverrides["batch_submit_max_time"] = "5s" + dymintTomlOverrides["block_batch_max_size_bytes"] = "1000" + dymintTomlOverrides["max_supported_batch_skew"] = "1" + dymintTomlOverrides["batch_acceptance_attempts"] = "1" + dymintTomlOverrides["batch_acceptance_timeout"] = "5s" configFileOverrides["config/dymint.toml"] = dymintTomlOverrides // Create chain factory with dymension @@ -239,7 +243,11 @@ func TestDisconnection_Wasm(t *testing.T) { dymintTomlOverrides["settlement_gas_prices"] = "0adym" dymintTomlOverrides["max_idle_time"] = "3s" dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + dymintTomlOverrides["batch_submit_max_time"] = "5s" + dymintTomlOverrides["block_batch_max_size_bytes"] = "1000" + dymintTomlOverrides["max_supported_batch_skew"] = "1" + dymintTomlOverrides["batch_acceptance_attempts"] = "1" + dymintTomlOverrides["batch_acceptance_timeout"] = "5s" configFileOverrides["config/dymint.toml"] = dymintTomlOverrides // Create chain factory with dymension diff --git a/tests/eibc_fulfillment_test.go b/tests/eibc_fulfillment_test.go index 07f381c0..8222ffe3 100644 --- a/tests/eibc_fulfillment_test.go +++ b/tests/eibc_fulfillment_test.go @@ -33,28 +33,20 @@ func TestEIBCFulfillOnOneRollApp_EVM(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides - // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + // setup config for rollapp 2 + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") modifyGenesisKV := append( dymensionGenesisKV, @@ -412,28 +404,20 @@ func TestEIBCFulfillOnOneRollApp_Wasm(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappwasm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides - // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappwasm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + // setup config for rollapp 2 + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") modifyGenesisKV := append( dymensionGenesisKV, @@ -793,28 +777,20 @@ func TestEIBCFulfillment_EVM(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides - // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + // setup config for rollapp 2 + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") modifyGenesisKV := append( dymensionGenesisKV, @@ -1097,28 +1073,21 @@ func TestEIBCFulfillment_Wasm(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappwasm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") + // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappwasm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") + modifyGenesisKV := append( dymensionGenesisKV, cosmos.GenesisKV{ @@ -1409,28 +1378,20 @@ func TestEIBCFulfillment_two_rollapps_EVM(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides - // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + // setup config for rollapp 2 + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") modifyGenesisKV := append( dymensionGenesisKV, @@ -1734,6 +1695,18 @@ func TestEIBCFulfillment_two_rollapps_EVM(t *testing.T) { } } + // verify funds were deducted from market maker's wallet address + balance, err = dymension.GetBalance(ctx, marketMakerAddr, rollappIBCDenom) + require.NoError(t, err) + fmt.Println("Balance of marketMakerAddr after fulfilling the order:", balance) + expMmBalanceRollappDenom = expMmBalanceRollappDenom.Sub((transferAmountWithoutFee)) + require.True(t, balance.Equal(expMmBalanceRollappDenom), fmt.Sprintf("Value mismatch. Expected %s, actual %s", expMmBalanceRollappDenom, balance)) + + balance, err = dymension.GetBalance(ctx, marketMakerAddr, rollapp2IBCDenom) + require.NoError(t, err) + fmt.Println("Balance of marketMakerAddr after fulfilling the order:", balance) + require.True(t, balance.Equal(expMmBalanceRollappDenom), fmt.Sprintf("Value mismatch. Expected %s, actual %s", expMmBalanceRollappDenom, balance)) + // wait a few blocks and verify sender received funds on the hub err = testutil.WaitForBlocks(ctx, 5, dymension) require.NoError(t, err) @@ -1747,17 +1720,7 @@ func TestEIBCFulfillment_two_rollapps_EVM(t *testing.T) { require.NoError(t, err) fmt.Println("Balance for ibc denom from rollapp 2 of dymensionUserAddr after fulfilling the order:", balance) require.True(t, balance.Equal(transferAmountWithoutFee), fmt.Sprintf("Value mismatch. Expected %s, actual %s", transferAmountWithoutFee, balance)) - // verify funds were deducted from market maker's wallet address - balance, err = dymension.GetBalance(ctx, marketMakerAddr, rollappIBCDenom) - require.NoError(t, err) - fmt.Println("Balance of marketMakerAddr after fulfilling the order:", balance) - expMmBalanceRollappDenom = expMmBalanceRollappDenom.Sub((transferAmountWithoutFee)) - require.True(t, balance.Equal(expMmBalanceRollappDenom), fmt.Sprintf("Value mismatch. Expected %s, actual %s", expMmBalanceRollappDenom, balance)) - balance, err = dymension.GetBalance(ctx, marketMakerAddr, rollapp2IBCDenom) - require.NoError(t, err) - fmt.Println("Balance of marketMakerAddr after fulfilling the order:", balance) - require.True(t, balance.Equal(expMmBalanceRollappDenom), fmt.Sprintf("Value mismatch. Expected %s, actual %s", expMmBalanceRollappDenom, balance)) // wait until packet finalization and verify funds + fee were added to market maker's wallet address isFinalized, err = dymension.WaitUntilRollappHeightIsFinalized(ctx, rollapp1.GetChainID(), rollappHeight, 200) require.NoError(t, err) @@ -1800,28 +1763,20 @@ func TestEIBCFulfillment_ThirdParty_EVM(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") + // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") modifyGenesisKV := append( dymensionGenesisKV, cosmos.GenesisKV{ @@ -2208,28 +2163,20 @@ func TestEIBCFulfillment_ThirdParty_Wasm(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappwasm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides - // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappwasm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + // setup config for rollapp 2 + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") modifyGenesisKV := append( dymensionGenesisKV, @@ -2606,28 +2553,21 @@ func TestEIBCFulfillment_ignore_hub_to_RA_EVM(t *testing.T) { // setup config for rollapp 1 // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") + // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") + modifyGenesisKV := append( dymensionGenesisKV, cosmos.GenesisKV{ @@ -2867,28 +2807,20 @@ func TestEIBCFulfillment_ignore_hub_to_RA_Wasm(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappwasm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") + // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappwasm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") modifyGenesisKV := append( dymensionGenesisKV, cosmos.GenesisKV{ diff --git a/tests/eibc_invariant_test.go b/tests/eibc_invariant_test.go index 1424f357..8e0c9a2d 100644 --- a/tests/eibc_invariant_test.go +++ b/tests/eibc_invariant_test.go @@ -28,28 +28,21 @@ func TestEIBCInvariant_EVM(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides const EPOCH_IDENTIFIER string = "minute" modifyGenesisKV := append( dymensionGenesisKV, diff --git a/tests/eibc_pfm_test.go b/tests/eibc_pfm_test.go index cfbda7d1..506e01c4 100644 --- a/tests/eibc_pfm_test.go +++ b/tests/eibc_pfm_test.go @@ -31,28 +31,20 @@ func TestEIBCPFM_EVM(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") // Create chain factory with dymension numHubVals := 1 numHubFullNodes := 1 diff --git a/tests/eibc_timeout_test.go b/tests/eibc_timeout_test.go index a8aa4cad..c75000fd 100644 --- a/tests/eibc_timeout_test.go +++ b/tests/eibc_timeout_test.go @@ -273,28 +273,21 @@ func TestEIBCTimeoutFulFillDymToRollapp_EVM(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides modifyGenesisKV := append( dymensionGenesisKV, cosmos.GenesisKV{ diff --git a/tests/erc20_ibc_transfer_test.go b/tests/erc20_ibc_transfer_test.go index 88f97950..1a87edd6 100644 --- a/tests/erc20_ibc_transfer_test.go +++ b/tests/erc20_ibc_transfer_test.go @@ -156,10 +156,6 @@ func TestERC20HubToRollAppWithoutRegister_EVM(t *testing.T) { channel, err := ibc.GetTransferChannel(ctx, r1, eRep, dymension.Config().ChainID, rollapp1.Config().ChainID) require.NoError(t, err) - // Start relayer - err = r1.StartRelayer(ctx, eRep, ibcPath) - require.NoError(t, err) - rollapp := rollappParam{ rollappID: rollapp1.Config().ChainID, channelID: channel.ChannelID, @@ -177,10 +173,13 @@ func TestERC20HubToRollAppWithoutRegister_EVM(t *testing.T) { Amount: transferAmount, } - _, err = dymension.SendIBCTransfer(ctx, channel.ChannelID, dymensionUserAddr, transferData, ibc.TransferOptions{}) + rollappHeight, err := rollapp1.GetNode().Height(ctx) require.NoError(t, err) - rollappHeight, err := rollapp1.GetNode().Height(ctx) + _, err = dymension.SendIBCTransfer(ctx, channel.ChannelID, dymensionUserAddr, transferData, ibc.TransferOptions{}) + require.NoError(t, err) + // Start relayer + err = r1.StartRelayer(ctx, eRep, ibcPath) require.NoError(t, err) balance, err := dymension.GetBalance(ctx, dymensionUserAddr, dymension.Config().Denom) diff --git a/tests/frozen_test.go b/tests/frozen_test.go index 4d1908bc..f5abcb17 100644 --- a/tests/frozen_test.go +++ b/tests/frozen_test.go @@ -726,27 +726,22 @@ func TestOtherRollappNotAffected_EVM(t *testing.T) { ctx := context.Background() - configFileOverrides := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides["config/dymint.toml"] = dymintTomlOverrides + // setup config for rollapp 1 + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides2 := make(testutil.Toml) - dymintTomlOverrides2["settlement_layer"] = "dymension" - dymintTomlOverrides2["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides2["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides2["settlement_gas_prices"] = "0adym" - dymintTomlOverrides2["max_idle_time"] = "3s" + // setup config for rollapp 2 + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides2 // Create chain factory with dymension numHubVals := 1 numHubFullNodes := 1 @@ -770,7 +765,7 @@ func TestOtherRollappNotAffected_EVM(t *testing.T) { EncodingConfig: encodingConfig(), NoHostMount: false, ModifyGenesis: modifyRollappEVMGenesis(rollappEVMGenesisKV), - ConfigFileOverrides: configFileOverrides, + ConfigFileOverrides: configFileOverrides1, }, NumValidators: &numRollAppVals, NumFullNodes: &numRollAppFn, @@ -1155,7 +1150,9 @@ func TestOtherRollappNotAffected_Wasm(t *testing.T) { dymintTomlOverrides2["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) dymintTomlOverrides2["rollapp_id"] = "rollappwasm_12345-1" dymintTomlOverrides2["settlement_gas_prices"] = "0adym" + dymintTomlOverrides2["max_proof_time"] = "500ms" dymintTomlOverrides2["max_idle_time"] = "3s" + dymintTomlOverrides2["batch_submit_max_time"] = "100s" configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides2 // Create chain factory with dymension @@ -1651,11 +1648,11 @@ func TestPacketRollbacked_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer1", network) s := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -2032,11 +2029,11 @@ func TestPacketRollbacked_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer1", network) s := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -2414,11 +2411,11 @@ func TestRollAppFreezeNoBrokenInvariants_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer1", network) s := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). @@ -2725,11 +2722,11 @@ func TestRollAppFreezeNoBrokenInvariants_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer1", network) s := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).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 5eca2014..8a7028a4 100644 --- a/tests/ibc_finalize_block_test.go +++ b/tests/ibc_finalize_block_test.go @@ -159,14 +159,14 @@ func TestDymFinalizeBlock_OnRecvPacket_EVM(t *testing.T) { Denom: dymension.Config().Denom, Amount: transferAmount, } - // Compose an IBC transfer and send from rollapp -> dymension - ibcTx, err := dymension.SendIBCTransfer(ctx, channel.ChannelID, dymensionUserAddr, transferData, ibc.TransferOptions{}) - require.NoError(t, err) - // Assert balance was updated on the rollapp - testutil.AssertBalance(t, ctx, dymension, dymensionUserAddr, dymension.Config().Denom, walletAmount.Sub(transferData.Amount)) dymensionHeight, err := dymension.Height(ctx) require.NoError(t, err) + // Compose an IBC transfer and send from hub -> rollapp + ibcTx, err := dymension.SendIBCTransfer(ctx, channel.ChannelID, dymensionUserAddr, transferData, ibc.TransferOptions{}) + require.NoError(t, err) + // Assert balance was updated on the hub + testutil.AssertBalance(t, ctx, dymension, dymensionUserAddr, dymension.Config().Denom, walletAmount.Sub(transferData.Amount)) ack, err := testutil.PollForAck(ctx, dymension, dymensionHeight, dymensionHeight+30, ibcTx.Packet) require.NoError(t, err) diff --git a/tests/rollapp_genesis_event_test.go b/tests/rollapp_genesis_event_test.go index fdbc6d65..fd788001 100644 --- a/tests/rollapp_genesis_event_test.go +++ b/tests/rollapp_genesis_event_test.go @@ -1501,7 +1501,7 @@ func TestTransferTriggerGenesisBoth_EVM(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer", network) ic := test.NewSetup(). @@ -1717,7 +1717,7 @@ func TestTransferTriggerGenesisBoth_Wasm(t *testing.T) { client, network := test.DockerSetup(t) r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/decentrio/relayer", "2.5.2", "100:1000"), + relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/upgrade_hub_test.go b/tests/upgrade_hub_test.go index f03261a6..7835b2b7 100644 --- a/tests/upgrade_hub_test.go +++ b/tests/upgrade_hub_test.go @@ -43,28 +43,20 @@ func TestHubUpgrade(t *testing.T) { ctx := context.Background() // setup config for rollapp 1 - configFileOverrides1 := make(map[string]any) - dymintTomlOverrides := make(testutil.Toml) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_1234-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides1["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp1 := "dymension" + settlement_node_address := fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) + rollapp1_id := "rollappevm_1234-1" + gas_price_rollapp1 := "0adym" + maxIdleTime1 := "10s" + maxProofTime := "500ms" + configFileOverrides1 := overridesDymintToml(settlement_layer_rollapp1, settlement_node_address, rollapp1_id, gas_price_rollapp1, maxIdleTime1, maxProofTime, "100s") + // setup config for rollapp 2 - configFileOverrides2 := make(map[string]any) - dymintTomlOverrides["settlement_layer"] = "dymension" - dymintTomlOverrides["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides["rollapp_id"] = "rollappevm_12345-1" - dymintTomlOverrides["settlement_gas_prices"] = "0adym" - dymintTomlOverrides["max_idle_time"] = "3s" - dymintTomlOverrides["max_proof_time"] = "500ms" - dymintTomlOverrides["batch_submit_max_time"] = "100s" - - configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides + settlement_layer_rollapp2 := "dymension" + rollapp2_id := "rollappevm_12345-1" + gas_price_rollapp2 := "0adym" + maxIdleTime2 := "1s" + configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") // Create chain factory with dymension numHubVals := 1 numHubFullNodes := 0 From 85731afb48d8b5b533eeed36964ffe697971fc46 Mon Sep 17 00:00:00 2001 From: ducnt131 <62016666+anhductn2001@users.noreply.github.com> Date: Tue, 28 May 2024 14:17:40 +0700 Subject: [PATCH 3/4] chore(ci): ability to get relayerVersion from env variable (#204) --- .github/workflows/e2e-test-workflow-call.yml | 7 ++++ 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, 138 insertions(+), 128 deletions(-) diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml index bf461119..e1f1be3e 100644 --- a/.github/workflows/e2e-test-workflow-call.yml +++ b/.github/workflows/e2e-test-workflow-call.yml @@ -16,6 +16,11 @@ on: required: false type: string default: "latest" + relayer_ci: + description: "CI run on Relayer Repo" + required: false + type: string + default: relayerVersion test: description: 'test name to run as standalone' required: false @@ -100,6 +105,7 @@ jobs: DYMENSION_CI: ${{ inputs.dymension_ci }} ROLLAPP_EVM_CI: ${{ inputs.rollapp_evm_ci }} ROLLAPP_WASM_CI: ${{ inputs.rollapp_wasm_ci }} + RELAYER_CI: ${{ inputs.relayer_ci }} # e2e-tests-by runs the actual go test command to trigger the test. rollapp-wasm: @@ -135,3 +141,4 @@ jobs: DYMENSION_CI: ${{ inputs.dymension_ci }} ROLLAPP_EVM_CI: ${{ inputs.rollapp_evm_ci }} ROLLAPP_WASM_CI: ${{ inputs.rollapp_wasm_ci }} + RELAYER_CI: ${{ inputs.relayer_ci }} diff --git a/tests/eibc_ack_error_test.go b/tests/eibc_ack_error_test.go index dbb3256d..e33a8537 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 7151f6bf..b4a62468 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 e3a8e9e2..64bcc083 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 8222ffe3..85d328d3 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) r3 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) // Relayer for gaia r3 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_invariant_test.go b/tests/eibc_invariant_test.go index 8e0c9a2d..a5473e58 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_nobalance_test.go b/tests/eibc_nobalance_test.go index 14ea41c7..1fa580e3 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 8108de38..10aa721a 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_pfm_test.go b/tests/eibc_pfm_test.go index 506e01c4..77a8949a 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/eibc_timeout_test.go b/tests/eibc_timeout_test.go index c75000fd..6bd5fbde 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) // relayer for rollapp gaia r3 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) // Relayer for gaia r3 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 1a87edd6..b08e605a 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) ic := test.NewSetup(). AddRollUp(dymension, rollapp1). diff --git a/tests/frozen_test.go b/tests/frozen_test.go index f5abcb17..8a9be68d 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) s := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) s := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 8a7028a4..2c67d0f5 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 512a77e5..234ac914 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/ibc_pfm_test.go b/tests/ibc_pfm_test.go index af464b5e..408f9f85 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 e281ea27..81a03891 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) r2 := test.NewBuiltinRelayerFactory( ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/ibc_timeout_test.go b/tests/ibc_timeout_test.go index 8c2bb495..a3bd1236 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/ibc_transfer_test.go b/tests/ibc_transfer_test.go index b0883eef..47e8a580 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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 fd788001..8a377ce2 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/rollapp_invariant_test.go b/tests/rollapp_invariant_test.go index 7969b1a6..25101615 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/rollapp_upgrade_test.go b/tests/rollapp_upgrade_test.go index 97481641..ea2159b3 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer", network) ic := test.NewSetup(). diff --git a/tests/sequencer_invariant_test.go b/tests/sequencer_invariant_test.go index d6d9a2c9..ddaef829 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup(). diff --git a/tests/setup.go b/tests/setup.go index 40367e8a..bc3901ed 100644 --- a/tests/setup.go +++ b/tests/setup.go @@ -60,10 +60,9 @@ var ( RollappWasmMainRepo = "ghcr.io/dymensionxyz/rollapp-wasm" - IBCRelayerImage = "ghcr.io/dymensionxyz/go-relayer" - IBCRelayerVersion = "main-dym" + RelayerMainRepo = "ghcr.io/dymensionxyz/go-relayer" - dymensionVersion, rollappEVMVersion, rollappWasmVersion = GetDockerImageVersion() + dymensionVersion, rollappEVMVersion, rollappWasmVersion, relayerVersion = GetDockerImageVersion() upgradeName, upgradeEVMName, upgradeWasmName = GetUpgradeName() @@ -300,7 +299,7 @@ var ( } ) -func GetDockerImageVersion() (dymensionVersion, rollappEVMVersion, rollappWasmVersion string) { +func GetDockerImageVersion() (dymensionVersion, rollappEVMVersion, rollappWasmVersion, relayerVersion string) { dymensionVersion, found := os.LookupEnv("DYMENSION_CI") if !found { dymensionVersion = "latest" @@ -315,7 +314,11 @@ func GetDockerImageVersion() (dymensionVersion, rollappEVMVersion, rollappWasmVe if !found { rollappWasmVersion = "latest" } - return dymensionVersion, rollappEVMVersion, rollappWasmVersion + relayerVersion, found = os.LookupEnv("RELAYER_CI") + if !found { + relayerVersion = "main-dym" + } + return dymensionVersion, rollappEVMVersion, rollappWasmVersion, relayerVersion } func GetUpgradeName() (upgradeName, upgradeEVMName, upgradeWasmName string) { diff --git a/tests/upgrade_hub_test.go b/tests/upgrade_hub_test.go index 7835b2b7..5d04b867 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("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer1", network) // relayer for rollapp 2 r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t), - relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"), + relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), ).Build(t, client, "relayer2", network) ic := test.NewSetup().AddRollUp(dymension, rollapp1, rollapp2). 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 4/4] 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).