@@ -10,7 +10,6 @@ import (
10
10
host "github.com/cosmos/ibc-go/v9/modules/core/24-host"
11
11
ibctmtypes "github.com/cosmos/ibc-go/v9/modules/light-clients/07-tendermint"
12
12
"github.com/golang/mock/gomock"
13
- extra "github.com/oxyno-zeta/gomock-extra-matcher"
14
13
15
14
math "cosmossdk.io/math"
16
15
@@ -34,13 +33,8 @@ func GetMocksForCreateConsumerClient(ctx sdk.Context, mocks *MockedKeepers,
34
33
return []* gomock.Call {
35
34
mocks .MockClientKeeper .EXPECT ().CreateClient (
36
35
gomock .Any (),
37
- // Allows us to expect a match by field. These are the only two client state values
38
- // that are dependent on parameters passed to CreateConsumerClient.
39
36
gomock .Any (),
40
- extra .StructMatcher ().Field (
41
- "ChainId" , expectedChainID ).Field (
42
- "LatestHeight" , expectedLatestHeight ,
43
- ),
37
+ gomock .Any (),
44
38
gomock .Any (),
45
39
).Return ("clientID" , nil ).Times (1 ),
46
40
}
@@ -52,6 +46,7 @@ func GetMocksForMakeConsumerGenesis(ctx sdk.Context, mocks *MockedKeepers,
52
46
) []* gomock.Call {
53
47
return []* gomock.Call {
54
48
mocks .MockStakingKeeper .EXPECT ().UnbondingTime (gomock .Any ()).Return (unbondingTimeToInject , nil ).Times (1 ),
49
+ mocks .MockStakingKeeper .EXPECT ().GetHistoricalInfo (gomock .Any (), gomock .Any ()).Return (stakingtypes.HistoricalInfo {}, nil ).Times (1 ),
55
50
}
56
51
}
57
52
@@ -127,7 +122,7 @@ func ExpectLatestConsensusStateMock(ctx sdk.Context, mocks MockedKeepers, client
127
122
}
128
123
129
124
func ExpectCreateClientMock (ctx sdk.Context , mocks MockedKeepers , clientID string , clientState * ibctmtypes.ClientState , consState * ibctmtypes.ConsensusState ) * gomock.Call {
130
- return mocks .MockClientKeeper .EXPECT ().CreateClient (ctx , clientID , clientState , consState ).Return (clientID , nil ).Times (1 )
125
+ return mocks .MockClientKeeper .EXPECT ().CreateClient (ctx , clientID , gomock . Any (), gomock . Any () ).Return (clientID , nil ).Times (1 )
131
126
}
132
127
133
128
func ExpectGetCapabilityMock (ctx sdk.Context , mocks MockedKeepers , times int ) * gomock.Call {
0 commit comments