Skip to content

Commit cfed28b

Browse files
mmsqemmsqe
committed
fix interchaintest
1 parent bad9d7d commit cfed28b

12 files changed

+100
-60
lines changed

Diff for: ‎interchaintest/backup_rpc_test.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,19 @@ func TestBackupRpcs(t *testing.T) {
7373
r := rf.Build(t, client, network)
7474

7575
const pathName = "chainA-chainB"
76-
76+
opts := ibc.CreateClientOptions{
77+
TrustingPeriod: "24h",
78+
}
7779
ic := interchaintest.NewInterchain().
7880
AddChain(chainA).
7981
AddChain(chainB).
8082
AddRelayer(r, "relayer").
8183
AddLink(interchaintest.InterchainLink{
82-
Chain1: chainA,
83-
Chain2: chainB,
84-
Relayer: r,
85-
Path: pathName,
84+
Chain1: chainA,
85+
Chain2: chainB,
86+
Relayer: r,
87+
Path: pathName,
88+
CreateClientOpts: opts,
8689
})
8790

8891
rep := testreporter.NewNopReporter()

Diff for: ‎interchaintest/fee_middleware_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ func TestRelayerFeeMiddleware(t *testing.T) {
5656
r := rf.Build(t, client, network)
5757

5858
const pathChainAChainB = "chainA-chainB"
59-
59+
opts := ibc.DefaultClientOpts()
60+
opts.TrustingPeriod = "24h"
6061
// Build the network
6162
ic := interchaintest.NewInterchain().
6263
AddChain(chainA).
@@ -73,7 +74,7 @@ func TestRelayerFeeMiddleware(t *testing.T) {
7374
Order: ibc.Unordered,
7475
Version: "{\"fee_version\":\"ics29-1\",\"app_version\":\"ics20-1\"}",
7576
},
76-
CreateClientOpts: ibc.DefaultClientOpts(),
77+
CreateClientOpts: opts,
7778
})
7879

7980
rep := testreporter.NewNopReporter()

Diff for: ‎interchaintest/feegrant_test.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,21 @@ func TestRelayerFeeGrant(t *testing.T) {
125125
}).Build(t, nil, "")
126126

127127
processor.PathProcMessageCollector = make(chan *processor.PathProcessorMessageResp, 10000)
128-
128+
opts := ibc.CreateClientOptions{
129+
TrustingPeriod: "24h",
130+
}
129131
// Prep Interchain
130132
const ibcPath = "gaia-osmosis"
131133
ic := interchaintest.NewInterchain().
132134
AddChain(gaia).
133135
AddChain(osmosis).
134136
AddRelayer(r, "relayer").
135137
AddLink(interchaintest.InterchainLink{
136-
Chain1: gaia,
137-
Chain2: osmosis,
138-
Relayer: r,
139-
Path: ibcPath,
138+
Chain1: gaia,
139+
Chain2: osmosis,
140+
Relayer: r,
141+
Path: ibcPath,
142+
CreateClientOpts: opts,
140143
})
141144

142145
// Reporter/logs
@@ -589,15 +592,19 @@ func TestRelayerFeeGrantExternal(t *testing.T) {
589592

590593
// Prep Interchain
591594
const ibcPath = "gaia-osmosis"
595+
opts := ibc.CreateClientOptions{
596+
TrustingPeriod: "24h",
597+
}
592598
ic := interchaintest.NewInterchain().
593599
AddChain(gaia).
594600
AddChain(osmosis).
595601
AddRelayer(r, "relayer").
596602
AddLink(interchaintest.InterchainLink{
597-
Chain1: gaia,
598-
Chain2: osmosis,
599-
Relayer: r,
600-
Path: ibcPath,
603+
Chain1: gaia,
604+
Chain2: osmosis,
605+
Relayer: r,
606+
Path: ibcPath,
607+
CreateClientOpts: opts,
601608
})
602609

603610
// Reporter/logs

Diff for: ‎interchaintest/ica_channel_close_test.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,19 @@ func TestScenarioICAChannelClose(t *testing.T) {
7272
// Build the network; spin up the chains and configure the relayer
7373
const pathName = "test-path"
7474
const relayerName = "relayer"
75-
75+
opts := ibc.CreateClientOptions{
76+
TrustingPeriod: "24h",
77+
}
7678
ic := interchaintest.NewInterchain().
7779
AddChain(chain1).
7880
AddChain(chain2).
7981
AddRelayer(r, relayerName).
8082
AddLink(interchaintest.InterchainLink{
81-
Chain1: chain1,
82-
Chain2: chain2,
83-
Relayer: r,
84-
Path: pathName,
83+
Chain1: chain1,
84+
Chain2: chain2,
85+
Relayer: r,
86+
Path: pathName,
87+
CreateClientOpts: opts,
8588
})
8689

8790
require.NoError(t, ic.Build(ctx, eRep, interchaintest.InterchainBuildOptions{

Diff for: ‎interchaintest/interchain_accounts_test.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,19 @@ func TestScenarioInterchainAccounts(t *testing.T) {
6969
// Build the network; spin up the chains and configure the relayer
7070
const pathName = "test-path"
7171
const relayerName = "relayer"
72-
72+
opts := ibc.CreateClientOptions{
73+
TrustingPeriod: "24h",
74+
}
7375
ic := interchaintest.NewInterchain().
7476
AddChain(chain1).
7577
AddChain(chain2).
7678
AddRelayer(r, relayerName).
7779
AddLink(interchaintest.InterchainLink{
78-
Chain1: chain1,
79-
Chain2: chain2,
80-
Relayer: r,
81-
Path: pathName,
80+
Chain1: chain1,
81+
Chain2: chain2,
82+
Relayer: r,
83+
Path: pathName,
84+
CreateClientOpts: opts,
8285
})
8386

8487
require.NoError(t, ic.Build(ctx, eRep, interchaintest.InterchainBuildOptions{

Diff for: ‎interchaintest/memo_receiver_limit_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ func TestMemoAndReceiverLimit(t *testing.T) {
8585
r := rf.Build(t, client, network)
8686

8787
const pathName = "chainA-chainB"
88-
8988
ic := interchaintest.NewInterchain().
9089
AddChain(chainA).
9190
AddChain(chainB).
@@ -95,6 +94,9 @@ func TestMemoAndReceiverLimit(t *testing.T) {
9594
Chain2: chainB,
9695
Relayer: r,
9796
Path: pathName,
97+
CreateClientOpts: ibc.CreateClientOptions{
98+
TrustingPeriod: "24h",
99+
},
98100
})
99101

100102
rep := testreporter.NewNopReporter()

Diff for: ‎interchaintest/misbehaviour_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ func TestRelayerMisbehaviourDetection(t *testing.T) {
7676
r := rf.Build(t, client, network)
7777

7878
const pathChainAChainB = "chainA-chainB"
79-
8079
ic := interchaintest.NewInterchain().
8180
AddChain(chainA).
8281
AddChain(chainB).

Diff for: ‎interchaintest/multi_channel_test.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,19 @@ func TestMultipleChannelsOneConnection(t *testing.T) {
5353
// Build the network; spin up the chains and configure the relayer
5454
const pathGaiaOsmosis = "gaia-osmosis"
5555
const relayerName = "relayer"
56-
56+
opts := ibc.CreateClientOptions{
57+
TrustingPeriod: "24h",
58+
}
5759
ic := interchaintest.NewInterchain().
5860
AddChain(gaia).
5961
AddChain(osmosis).
6062
AddRelayer(r, relayerName).
6163
AddLink(interchaintest.InterchainLink{
62-
Chain1: gaia,
63-
Chain2: osmosis,
64-
Relayer: r,
65-
Path: pathGaiaOsmosis,
64+
Chain1: gaia,
65+
Chain2: osmosis,
66+
Relayer: r,
67+
Path: pathGaiaOsmosis,
68+
CreateClientOpts: opts,
6669
})
6770

6871
rep := testreporter.NewNopReporter()

Diff for: ‎interchaintest/path_filter_test.go

+16-8
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,19 @@ func TestScenarioPathFilterAllow(t *testing.T) {
4747

4848
// Prep Interchain
4949
const ibcPath = "gaia-osmosis"
50+
opts := ibc.CreateClientOptions{
51+
TrustingPeriod: "24h",
52+
}
5053
ic := interchaintest.NewInterchain().
5154
AddChain(gaia).
5255
AddChain(osmosis).
5356
AddRelayer(r, "relayer").
5457
AddLink(interchaintest.InterchainLink{
55-
Chain1: gaia,
56-
Chain2: osmosis,
57-
Relayer: r,
58-
Path: ibcPath,
58+
Chain1: gaia,
59+
Chain2: osmosis,
60+
Relayer: r,
61+
Path: ibcPath,
62+
CreateClientOpts: opts,
5963
})
6064

6165
// Reporter/logs
@@ -191,15 +195,19 @@ func TestScenarioPathFilterDeny(t *testing.T) {
191195

192196
// Prep Interchain
193197
const ibcPath = "gaia-osmosis"
198+
opts := ibc.CreateClientOptions{
199+
TrustingPeriod: "24h",
200+
}
194201
ic := interchaintest.NewInterchain().
195202
AddChain(gaia).
196203
AddChain(osmosis).
197204
AddRelayer(r, "relayer").
198205
AddLink(interchaintest.InterchainLink{
199-
Chain1: gaia,
200-
Chain2: osmosis,
201-
Relayer: r,
202-
Path: ibcPath,
206+
Chain1: gaia,
207+
Chain2: osmosis,
208+
Relayer: r,
209+
Path: ibcPath,
210+
CreateClientOpts: opts,
203211
})
204212

205213
rep := testreporter.NewNopReporter()

Diff for: ‎interchaintest/relay_many_test.go

+13-9
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,27 @@ func TestRelayerMultiplePathsSingleProcess(t *testing.T) {
6565
const pathGaiaOsmosis = "gaia-osmosis"
6666
const pathGaiaJuno = "gaia-juno"
6767
const relayerName = "relayer"
68-
68+
opts := ibc.CreateClientOptions{
69+
TrustingPeriod: "24h",
70+
}
6971
ic := interchaintest.NewInterchain().
7072
AddChain(gaia).
7173
AddChain(osmosis).
7274
AddChain(juno).
7375
AddRelayer(r, relayerName).
7476
AddLink(interchaintest.InterchainLink{
75-
Chain1: gaia,
76-
Chain2: osmosis,
77-
Relayer: r,
78-
Path: pathGaiaOsmosis,
77+
Chain1: gaia,
78+
Chain2: osmosis,
79+
Relayer: r,
80+
Path: pathGaiaOsmosis,
81+
CreateClientOpts: opts,
7982
}).
8083
AddLink(interchaintest.InterchainLink{
81-
Chain1: gaia,
82-
Chain2: juno,
83-
Relayer: r,
84-
Path: pathGaiaJuno,
84+
Chain1: gaia,
85+
Chain2: juno,
86+
Relayer: r,
87+
Path: pathGaiaJuno,
88+
CreateClientOpts: opts,
8589
})
8690

8791
client, network := interchaintest.DockerSetup(t)

Diff for: ‎interchaintest/relayer_override_test.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,19 @@ func TestClientOverrideFlag(t *testing.T) {
6060
// Build the network; spin up the chains and configure the relayer
6161
const pathGaiaOsmosis = "gaia-osmosis"
6262
const relayerName = "relayer"
63-
63+
opts := ibc.CreateClientOptions{
64+
TrustingPeriod: "24h",
65+
}
6466
ic := interchaintest.NewInterchain().
6567
AddChain(gaia).
6668
AddChain(osmosis).
6769
AddRelayer(r, relayerName).
6870
AddLink(interchaintest.InterchainLink{
69-
Chain1: gaia,
70-
Chain2: osmosis,
71-
Relayer: r,
72-
Path: pathGaiaOsmosis,
71+
Chain1: gaia,
72+
Chain2: osmosis,
73+
Relayer: r,
74+
Path: pathGaiaOsmosis,
75+
CreateClientOpts: opts,
7376
})
7477

7578
require.NoError(t, ic.Build(ctx, eRep, interchaintest.InterchainBuildOptions{

Diff for: ‎interchaintest/tendermint_v0.37_boundary_test.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/strangelove-ventures/interchaintest/v9"
99
"github.com/strangelove-ventures/interchaintest/v9/chain/cosmos"
1010
"github.com/strangelove-ventures/interchaintest/v9/conformance"
11+
"github.com/strangelove-ventures/interchaintest/v9/ibc"
1112
"github.com/strangelove-ventures/interchaintest/v9/testreporter"
1213
"github.com/stretchr/testify/require"
1314
"go.uber.org/zap/zaptest"
@@ -58,16 +59,19 @@ func TestScenarioTendermint37Boundary(t *testing.T) {
5859
r := rf.Build(t, client, network)
5960

6061
t.Parallel()
61-
62+
opts := ibc.CreateClientOptions{
63+
TrustingPeriod: "24h",
64+
}
6265
ic := interchaintest.NewInterchain().
6366
AddChain(chain).
6467
AddChain(counterpartyChain).
6568
AddRelayer(r, relayerName).
6669
AddLink(interchaintest.InterchainLink{
67-
Chain1: chain,
68-
Chain2: counterpartyChain,
69-
Relayer: r,
70-
Path: path,
70+
Chain1: chain,
71+
Chain2: counterpartyChain,
72+
Relayer: r,
73+
Path: path,
74+
CreateClientOpts: opts,
7175
})
7276

7377
ctx := context.Background()

0 commit comments

Comments
 (0)