Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ require (
cosmossdk.io/x/tx v0.14.0-rc.1
cosmossdk.io/x/upgrade v0.2.0-rc.2
github.com/cosmos/cosmos-db v1.1.1
github.com/cosmos/ibc-go/v10 v10.0.0
github.com/cosmos/ibc-go/v10 v10.1.1
github.com/informalsystems/itf-go v0.0.1
github.com/spf13/viper v1.20.1
golang.org/x/mod v0.24.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -829,8 +829,8 @@ github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fr
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
github.com/cosmos/iavl v1.2.2 h1:qHhKW3I70w+04g5KdsdVSHRbFLgt3yY3qTMd4Xa4rC8=
github.com/cosmos/iavl v1.2.2/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
github.com/cosmos/ibc-go/v10 v10.0.0 h1:38nkt3kSrBLnA7mm9Gg4S11X3wtWdbLv7laBZ8hzc5o=
github.com/cosmos/ibc-go/v10 v10.0.0/go.mod h1:82OVClziZQ+9EyDRrnlr2eewcewQ0cxLu7LAbF+q7mc=
github.com/cosmos/ibc-go/v10 v10.1.1 h1:Mtl0Ydr9dVdOrPqmxCAG49RmX2/VDYeKYdwv3G2y0g8=
github.com/cosmos/ibc-go/v10 v10.1.1/go.mod h1:0pJCkgEYRMygqkvUcwy6Kuf5wPfIsObRoxFU2DJEil4=
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
github.com/cosmos/ledger-cosmos-go v0.14.0 h1:WfCHricT3rPbkPSVKRH+L4fQGKYHuGOK9Edpel8TYpE=
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ type CCVTestSuite struct {

// NewCCVTestSuite returns a new instance of CCVTestSuite, ready to be tested against using suite.Run().
func NewCCVTestSuite[Tp testutil.ProviderApp, Tc testutil.ConsumerApp](
providerAppIniter icstestingutils.AppIniter,
providerAppIniter ibctesting.AppCreator,
consumerAppIniter icstestingutils.ValSetAppIniter,
skippedTests []string,
) *CCVTestSuite {
Expand Down
2 changes: 1 addition & 1 deletion tests/interchain/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
cosmossdk.io/x/upgrade v0.2.0-rc.2
github.com/cometbft/cometbft v0.38.17
github.com/cosmos/cosmos-sdk v0.53.0-rc.2
github.com/cosmos/ibc-go/v10 v10.0.0
github.com/cosmos/ibc-go/v10 v10.1.1
github.com/cosmos/interchain-security/v7 v7.0.0-20250220171855-c39340d2cf4c
github.com/docker/docker v28.0.0+incompatible
github.com/strangelove-ventures/interchaintest/v8 v8.7.1
Expand Down
4 changes: 2 additions & 2 deletions tests/interchain/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -850,8 +850,8 @@ github.com/cosmos/iavl v1.2.4 h1:IHUrG8dkyueKEY72y92jajrizbkZKPZbMmG14QzsEkw=
github.com/cosmos/iavl v1.2.4/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI=
github.com/cosmos/ibc-go/modules/capability v1.0.1/go.mod h1:rquyOV262nGJplkumH+/LeYs04P3eV8oB7ZM4Ygqk4E=
github.com/cosmos/ibc-go/v10 v10.0.0 h1:38nkt3kSrBLnA7mm9Gg4S11X3wtWdbLv7laBZ8hzc5o=
github.com/cosmos/ibc-go/v10 v10.0.0/go.mod h1:82OVClziZQ+9EyDRrnlr2eewcewQ0cxLu7LAbF+q7mc=
github.com/cosmos/ibc-go/v10 v10.1.1 h1:Mtl0Ydr9dVdOrPqmxCAG49RmX2/VDYeKYdwv3G2y0g8=
github.com/cosmos/ibc-go/v10 v10.1.1/go.mod h1:0pJCkgEYRMygqkvUcwy6Kuf5wPfIsObRoxFU2DJEil4=
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
github.com/cosmos/interchaintest/v8 v8.8.2-0.20250224162529-535379c62c73 h1:cIWTHr2fXdqNrVaFHz92g28SeYKDkF1PN6/Tm+kZMdQ=
Expand Down
2 changes: 1 addition & 1 deletion tests/mbt/driver/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func newChain(
t *testing.T,
modelParams ModelParams,
coord *ibctesting.Coordinator,
appInit icstestingutils.AppIniter,
appInit ibctesting.AppCreator,
chainID string,
validators *cmttypes.ValidatorSet,
signers map[string]cmttypes.PrivValidator,
Expand Down
6 changes: 2 additions & 4 deletions testutil/ibc_testing/generic_setup.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package ibc_testing

import (
"encoding/json"
"fmt"
"testing"

Expand All @@ -25,8 +24,7 @@ import (
)

type (
AppIniter func() (ibctesting.TestingApp, map[string]json.RawMessage)
ValSetAppIniter func([]types.ValidatorUpdate) AppIniter
ValSetAppIniter func([]types.ValidatorUpdate) ibctesting.AppCreator
)

// Contains generic setup code for running integration tests against a provider, consumer,
Expand Down Expand Up @@ -80,7 +78,7 @@ func (cb ConsumerBundle) GetKeeper() consumerkeeper.Keeper {
}

// AddProvider adds a new provider chain to the coordinator and returns the test chain and app type
func AddProvider[T testutil.ProviderApp](t *testing.T, coordinator *ibctesting.Coordinator, appIniter AppIniter) (
func AddProvider[T testutil.ProviderApp](t *testing.T, coordinator *ibctesting.Coordinator, appIniter ibctesting.AppCreator) (
*ibctesting.TestChain, T,
) {
t.Helper()
Expand Down
10 changes: 5 additions & 5 deletions testutil/ibc_testing/specific_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
)

var (
_ AppIniter = ProviderAppIniter
_ ValSetAppIniter = ConsumerAppIniter
_ ValSetAppIniter = DemocracyConsumerAppIniter
_ ibctesting.AppCreator = ProviderAppIniter
_ ValSetAppIniter = ConsumerAppIniter
_ ValSetAppIniter = DemocracyConsumerAppIniter
)

// ProviderAppIniter implements ibctesting.AppIniter for a provider app
Expand All @@ -39,7 +39,7 @@ func ProviderAppIniter() (ibctesting.TestingApp, map[string]json.RawMessage) {
}

// ConsumerAppIniter returns a ibctesting.ValSetAppIniter for a consumer app
func ConsumerAppIniter(initValPowers []types.ValidatorUpdate) AppIniter {
func ConsumerAppIniter(initValPowers []types.ValidatorUpdate) ibctesting.AppCreator {
return func() (ibctesting.TestingApp, map[string]json.RawMessage) {
encoding := appConsumer.MakeTestEncodingConfig()
testApp := appConsumer.New(log.NewNopLogger(), db.NewMemDB(), nil, true, simtestutil.EmptyAppOptions{})
Expand All @@ -63,7 +63,7 @@ func ConsumerAppIniter(initValPowers []types.ValidatorUpdate) AppIniter {
}

// DemocracyConsumerAppIniter implements ibctesting.ValSetAppIniter for a democracy consumer app
func DemocracyConsumerAppIniter(initValPowers []types.ValidatorUpdate) AppIniter {
func DemocracyConsumerAppIniter(initValPowers []types.ValidatorUpdate) ibctesting.AppCreator {
return func() (ibctesting.TestingApp, map[string]json.RawMessage) {
encoding := appConsumerDemocracy.MakeTestEncodingConfig()
testApp := appConsumerDemocracy.New(log.NewNopLogger(), db.NewMemDB(), nil, true, simtestutil.EmptyAppOptions{})
Expand Down
Loading