From cfed28b37aecfe69c6c1325ad33eaa384bfcd9dd Mon Sep 17 00:00:00 2001 From: mmsqe Date: Thu, 23 Jan 2025 17:24:35 +0800 Subject: [PATCH] fix interchaintest --- interchaintest/backup_rpc_test.go | 13 ++++++---- interchaintest/fee_middleware_test.go | 5 ++-- interchaintest/feegrant_test.go | 25 ++++++++++++------- interchaintest/ica_channel_close_test.go | 13 ++++++---- interchaintest/interchain_accounts_test.go | 13 ++++++---- interchaintest/memo_receiver_limit_test.go | 4 ++- interchaintest/misbehaviour_test.go | 1 - interchaintest/multi_channel_test.go | 13 ++++++---- interchaintest/path_filter_test.go | 24 ++++++++++++------ interchaintest/relay_many_test.go | 22 +++++++++------- interchaintest/relayer_override_test.go | 13 ++++++---- .../tendermint_v0.37_boundary_test.go | 14 +++++++---- 12 files changed, 100 insertions(+), 60 deletions(-) diff --git a/interchaintest/backup_rpc_test.go b/interchaintest/backup_rpc_test.go index 3e934814c..b2e265c91 100644 --- a/interchaintest/backup_rpc_test.go +++ b/interchaintest/backup_rpc_test.go @@ -73,16 +73,19 @@ func TestBackupRpcs(t *testing.T) { r := rf.Build(t, client, network) const pathName = "chainA-chainB" - + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(chainA). AddChain(chainB). AddRelayer(r, "relayer"). AddLink(interchaintest.InterchainLink{ - Chain1: chainA, - Chain2: chainB, - Relayer: r, - Path: pathName, + Chain1: chainA, + Chain2: chainB, + Relayer: r, + Path: pathName, + CreateClientOpts: opts, }) rep := testreporter.NewNopReporter() diff --git a/interchaintest/fee_middleware_test.go b/interchaintest/fee_middleware_test.go index 37d7c95cb..160a84e3a 100644 --- a/interchaintest/fee_middleware_test.go +++ b/interchaintest/fee_middleware_test.go @@ -56,7 +56,8 @@ func TestRelayerFeeMiddleware(t *testing.T) { r := rf.Build(t, client, network) const pathChainAChainB = "chainA-chainB" - + opts := ibc.DefaultClientOpts() + opts.TrustingPeriod = "24h" // Build the network ic := interchaintest.NewInterchain(). AddChain(chainA). @@ -73,7 +74,7 @@ func TestRelayerFeeMiddleware(t *testing.T) { Order: ibc.Unordered, Version: "{\"fee_version\":\"ics29-1\",\"app_version\":\"ics20-1\"}", }, - CreateClientOpts: ibc.DefaultClientOpts(), + CreateClientOpts: opts, }) rep := testreporter.NewNopReporter() diff --git a/interchaintest/feegrant_test.go b/interchaintest/feegrant_test.go index 5cc1f6e33..d1b52c6bf 100644 --- a/interchaintest/feegrant_test.go +++ b/interchaintest/feegrant_test.go @@ -125,7 +125,9 @@ func TestRelayerFeeGrant(t *testing.T) { }).Build(t, nil, "") processor.PathProcMessageCollector = make(chan *processor.PathProcessorMessageResp, 10000) - + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } // Prep Interchain const ibcPath = "gaia-osmosis" ic := interchaintest.NewInterchain(). @@ -133,10 +135,11 @@ func TestRelayerFeeGrant(t *testing.T) { AddChain(osmosis). AddRelayer(r, "relayer"). AddLink(interchaintest.InterchainLink{ - Chain1: gaia, - Chain2: osmosis, - Relayer: r, - Path: ibcPath, + Chain1: gaia, + Chain2: osmosis, + Relayer: r, + Path: ibcPath, + CreateClientOpts: opts, }) // Reporter/logs @@ -589,15 +592,19 @@ func TestRelayerFeeGrantExternal(t *testing.T) { // Prep Interchain const ibcPath = "gaia-osmosis" + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(gaia). AddChain(osmosis). AddRelayer(r, "relayer"). AddLink(interchaintest.InterchainLink{ - Chain1: gaia, - Chain2: osmosis, - Relayer: r, - Path: ibcPath, + Chain1: gaia, + Chain2: osmosis, + Relayer: r, + Path: ibcPath, + CreateClientOpts: opts, }) // Reporter/logs diff --git a/interchaintest/ica_channel_close_test.go b/interchaintest/ica_channel_close_test.go index b3922235b..fb2689d43 100644 --- a/interchaintest/ica_channel_close_test.go +++ b/interchaintest/ica_channel_close_test.go @@ -72,16 +72,19 @@ func TestScenarioICAChannelClose(t *testing.T) { // Build the network; spin up the chains and configure the relayer const pathName = "test-path" const relayerName = "relayer" - + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(chain1). AddChain(chain2). AddRelayer(r, relayerName). AddLink(interchaintest.InterchainLink{ - Chain1: chain1, - Chain2: chain2, - Relayer: r, - Path: pathName, + Chain1: chain1, + Chain2: chain2, + Relayer: r, + Path: pathName, + CreateClientOpts: opts, }) require.NoError(t, ic.Build(ctx, eRep, interchaintest.InterchainBuildOptions{ diff --git a/interchaintest/interchain_accounts_test.go b/interchaintest/interchain_accounts_test.go index 3d55b9f24..575d358d3 100644 --- a/interchaintest/interchain_accounts_test.go +++ b/interchaintest/interchain_accounts_test.go @@ -69,16 +69,19 @@ func TestScenarioInterchainAccounts(t *testing.T) { // Build the network; spin up the chains and configure the relayer const pathName = "test-path" const relayerName = "relayer" - + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(chain1). AddChain(chain2). AddRelayer(r, relayerName). AddLink(interchaintest.InterchainLink{ - Chain1: chain1, - Chain2: chain2, - Relayer: r, - Path: pathName, + Chain1: chain1, + Chain2: chain2, + Relayer: r, + Path: pathName, + CreateClientOpts: opts, }) require.NoError(t, ic.Build(ctx, eRep, interchaintest.InterchainBuildOptions{ diff --git a/interchaintest/memo_receiver_limit_test.go b/interchaintest/memo_receiver_limit_test.go index d204ebd88..e9ebb6792 100644 --- a/interchaintest/memo_receiver_limit_test.go +++ b/interchaintest/memo_receiver_limit_test.go @@ -85,7 +85,6 @@ func TestMemoAndReceiverLimit(t *testing.T) { r := rf.Build(t, client, network) const pathName = "chainA-chainB" - ic := interchaintest.NewInterchain(). AddChain(chainA). AddChain(chainB). @@ -95,6 +94,9 @@ func TestMemoAndReceiverLimit(t *testing.T) { Chain2: chainB, Relayer: r, Path: pathName, + CreateClientOpts: ibc.CreateClientOptions{ + TrustingPeriod: "24h", + }, }) rep := testreporter.NewNopReporter() diff --git a/interchaintest/misbehaviour_test.go b/interchaintest/misbehaviour_test.go index b45b02f60..464e99bc7 100644 --- a/interchaintest/misbehaviour_test.go +++ b/interchaintest/misbehaviour_test.go @@ -76,7 +76,6 @@ func TestRelayerMisbehaviourDetection(t *testing.T) { r := rf.Build(t, client, network) const pathChainAChainB = "chainA-chainB" - ic := interchaintest.NewInterchain(). AddChain(chainA). AddChain(chainB). diff --git a/interchaintest/multi_channel_test.go b/interchaintest/multi_channel_test.go index 8dbd67659..e25e3e730 100644 --- a/interchaintest/multi_channel_test.go +++ b/interchaintest/multi_channel_test.go @@ -53,16 +53,19 @@ func TestMultipleChannelsOneConnection(t *testing.T) { // Build the network; spin up the chains and configure the relayer const pathGaiaOsmosis = "gaia-osmosis" const relayerName = "relayer" - + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(gaia). AddChain(osmosis). AddRelayer(r, relayerName). AddLink(interchaintest.InterchainLink{ - Chain1: gaia, - Chain2: osmosis, - Relayer: r, - Path: pathGaiaOsmosis, + Chain1: gaia, + Chain2: osmosis, + Relayer: r, + Path: pathGaiaOsmosis, + CreateClientOpts: opts, }) rep := testreporter.NewNopReporter() diff --git a/interchaintest/path_filter_test.go b/interchaintest/path_filter_test.go index a54fc5262..41bb24945 100644 --- a/interchaintest/path_filter_test.go +++ b/interchaintest/path_filter_test.go @@ -47,15 +47,19 @@ func TestScenarioPathFilterAllow(t *testing.T) { // Prep Interchain const ibcPath = "gaia-osmosis" + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(gaia). AddChain(osmosis). AddRelayer(r, "relayer"). AddLink(interchaintest.InterchainLink{ - Chain1: gaia, - Chain2: osmosis, - Relayer: r, - Path: ibcPath, + Chain1: gaia, + Chain2: osmosis, + Relayer: r, + Path: ibcPath, + CreateClientOpts: opts, }) // Reporter/logs @@ -191,15 +195,19 @@ func TestScenarioPathFilterDeny(t *testing.T) { // Prep Interchain const ibcPath = "gaia-osmosis" + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(gaia). AddChain(osmosis). AddRelayer(r, "relayer"). AddLink(interchaintest.InterchainLink{ - Chain1: gaia, - Chain2: osmosis, - Relayer: r, - Path: ibcPath, + Chain1: gaia, + Chain2: osmosis, + Relayer: r, + Path: ibcPath, + CreateClientOpts: opts, }) rep := testreporter.NewNopReporter() diff --git a/interchaintest/relay_many_test.go b/interchaintest/relay_many_test.go index fc1c4faa2..b715ac8b0 100644 --- a/interchaintest/relay_many_test.go +++ b/interchaintest/relay_many_test.go @@ -65,23 +65,27 @@ func TestRelayerMultiplePathsSingleProcess(t *testing.T) { const pathGaiaOsmosis = "gaia-osmosis" const pathGaiaJuno = "gaia-juno" const relayerName = "relayer" - + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(gaia). AddChain(osmosis). AddChain(juno). AddRelayer(r, relayerName). AddLink(interchaintest.InterchainLink{ - Chain1: gaia, - Chain2: osmosis, - Relayer: r, - Path: pathGaiaOsmosis, + Chain1: gaia, + Chain2: osmosis, + Relayer: r, + Path: pathGaiaOsmosis, + CreateClientOpts: opts, }). AddLink(interchaintest.InterchainLink{ - Chain1: gaia, - Chain2: juno, - Relayer: r, - Path: pathGaiaJuno, + Chain1: gaia, + Chain2: juno, + Relayer: r, + Path: pathGaiaJuno, + CreateClientOpts: opts, }) client, network := interchaintest.DockerSetup(t) diff --git a/interchaintest/relayer_override_test.go b/interchaintest/relayer_override_test.go index fb8b6fae8..fee0ddf66 100644 --- a/interchaintest/relayer_override_test.go +++ b/interchaintest/relayer_override_test.go @@ -60,16 +60,19 @@ func TestClientOverrideFlag(t *testing.T) { // Build the network; spin up the chains and configure the relayer const pathGaiaOsmosis = "gaia-osmosis" const relayerName = "relayer" - + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(gaia). AddChain(osmosis). AddRelayer(r, relayerName). AddLink(interchaintest.InterchainLink{ - Chain1: gaia, - Chain2: osmosis, - Relayer: r, - Path: pathGaiaOsmosis, + Chain1: gaia, + Chain2: osmosis, + Relayer: r, + Path: pathGaiaOsmosis, + CreateClientOpts: opts, }) require.NoError(t, ic.Build(ctx, eRep, interchaintest.InterchainBuildOptions{ diff --git a/interchaintest/tendermint_v0.37_boundary_test.go b/interchaintest/tendermint_v0.37_boundary_test.go index 2c025131f..96c7f9256 100644 --- a/interchaintest/tendermint_v0.37_boundary_test.go +++ b/interchaintest/tendermint_v0.37_boundary_test.go @@ -8,6 +8,7 @@ import ( "github.com/strangelove-ventures/interchaintest/v9" "github.com/strangelove-ventures/interchaintest/v9/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v9/conformance" + "github.com/strangelove-ventures/interchaintest/v9/ibc" "github.com/strangelove-ventures/interchaintest/v9/testreporter" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" @@ -58,16 +59,19 @@ func TestScenarioTendermint37Boundary(t *testing.T) { r := rf.Build(t, client, network) t.Parallel() - + opts := ibc.CreateClientOptions{ + TrustingPeriod: "24h", + } ic := interchaintest.NewInterchain(). AddChain(chain). AddChain(counterpartyChain). AddRelayer(r, relayerName). AddLink(interchaintest.InterchainLink{ - Chain1: chain, - Chain2: counterpartyChain, - Relayer: r, - Path: path, + Chain1: chain, + Chain2: counterpartyChain, + Relayer: r, + Path: path, + CreateClientOpts: opts, }) ctx := context.Background()