Skip to content

Commit a0bf113

Browse files
tac0turtletac0turtle
committed
remove cometabci direct dep
1 parent a1ef65e commit a0bf113

File tree

29 files changed

+57
-38
lines changed

29 files changed

+57
-38
lines changed

‎e2e/go.mod

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,28 @@ replace github.com/cosmos/ibc-go/v9 => ../
282282

283283
replace github.com/cosmos/ibc-go/modules/light-clients/08-wasm => ../modules/light-clients/08-wasm
284284

285-
replace github.com/cosmos/ibc-go/modules/capability => ../modules/capability //TODO: remove after capability is tagged
286-
287285
replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
288286

289287
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
288+
289+
//TODO: remove everything below after tags are created
290+
replace (
291+
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
292+
cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.0.0-20240905174638-8ce77cbb2450
293+
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240906083041-6033330182c7 // main
294+
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
295+
cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20240905174638-8ce77cbb2450
296+
cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20240905174638-8ce77cbb2450
297+
cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20240905174638-8ce77cbb2450
298+
cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20240905174638-8ce77cbb2450
299+
cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20240905174638-8ce77cbb2450
300+
cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20240905174638-8ce77cbb2450
301+
cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20240905174638-8ce77cbb2450
302+
cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20240905174638-8ce77cbb2450
303+
cosmossdk.io/x/tx => cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897 // main
304+
cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20240905174638-8ce77cbb2450
305+
github.com/cometbft/cometbft => github.com/cometbft/cometbft v1.0.0-rc1
306+
// pseudo version lower than the latest tag
307+
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-alpha.1.0.20240905174638-8ce77cbb2450
308+
github.com/cosmos/ibc-go/modules/capability => ../modules/capability //TODO: remove after capability is tagged
309+
)

‎e2e/testsuite/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package testsuite
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

6-
abci "github.com/cometbft/cometbft/abci/types"
6+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
77
)
88

99
// ABCIToSDKEvents converts a list of ABCI events to Cosmos SDK events.

‎e2e/testsuite/tx.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
2626
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
2727

28-
abci "github.com/cometbft/cometbft/abci/types"
28+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
2929

3030
"github.com/cosmos/ibc-go/e2e/testsuite/query"
3131
"github.com/cosmos/ibc-go/e2e/testsuite/sanitize"

‎go.sum

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4At
200200
cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw=
201201
cosmossdk.io/core v0.12.1-0.20240906083041-6033330182c7 h1:1uZhb/TVewamHZMF4M37XZxScX/zcp4/oHFcvD20AvQ=
202202
cosmossdk.io/core v0.12.1-0.20240906083041-6033330182c7/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90=
203-
cosmossdk.io/core/testing v0.0.0-20240903211221-70488a89a87a h1:ZGdQEJkQLXOcU9lPkowIFxPR4kjZuqoq3jDJ5Qe4D3Y=
204-
cosmossdk.io/core/testing v0.0.0-20240903211221-70488a89a87a/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY=
203+
cosmossdk.io/core/testing v0.0.0-20240906090851-36d9b25e8981 h1:DY3LCYNxy4Jioampxo5Q8Qnt+Oj3b9Zy9K7JeCt0nqo=
204+
cosmossdk.io/core/testing v0.0.0-20240906090851-36d9b25e8981/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY=
205205
cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=
206206
cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8=
207207
cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
@@ -717,9 +717,8 @@ github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
717717
github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
718718
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
719719
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
720+
github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
720721
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
721-
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
722-
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
723722
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
724723
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
725724
github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA=

‎modules/apps/27-interchain-accounts/host/client/cli/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/cosmos/cosmos-sdk/version"
1414
"github.com/cosmos/cosmos-sdk/x/auth/tx"
1515

16-
abci "github.com/cometbft/cometbft/abci/types"
16+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1717

1818
"github.com/cosmos/ibc-go/v9/modules/apps/27-interchain-accounts/host/types"
1919
icatypes "github.com/cosmos/ibc-go/v9/modules/apps/27-interchain-accounts/types"

‎modules/apps/29-fee/keeper/events_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package keeper_test
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

6-
abcitypes "github.com/cometbft/cometbft/abci/types"
6+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
77

88
"github.com/cosmos/ibc-go/v9/modules/apps/29-fee/types"
99
transfertypes "github.com/cosmos/ibc-go/v9/modules/apps/transfer/types"
@@ -38,7 +38,7 @@ func (suite *KeeperTestSuite) TestIncentivizePacketEvent() {
3838
result, err := suite.chainA.SendMsgs(msg)
3939
suite.Require().NoError(err)
4040

41-
var incentivizedPacketEvent abcitypes.Event
41+
var incentivizedPacketEvent abci.Event
4242
for _, event := range result.Events {
4343
if event.Type == types.EventTypeIncentivizedPacket {
4444
incentivizedPacketEvent = event

‎modules/apps/callbacks/callbacks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
1818
sdk "github.com/cosmos/cosmos-sdk/types"
1919

20-
abci "github.com/cometbft/cometbft/abci/types"
20+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
2121

2222
"github.com/cosmos/ibc-go/modules/apps/callbacks/testing/simapp"
2323
"github.com/cosmos/ibc-go/modules/apps/callbacks/types"

‎modules/apps/callbacks/testing/simapp/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ import (
9999
"github.com/cosmos/cosmos-sdk/x/genutil"
100100
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
101101

102-
abci "github.com/cometbft/cometbft/abci/types"
102+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
103103

104104
ibccallbacks "github.com/cosmos/ibc-go/modules/apps/callbacks"
105105
"github.com/cosmos/ibc-go/modules/capability"

‎modules/apps/callbacks/types/events_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package types_test
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

6-
abci "github.com/cometbft/cometbft/abci/types"
6+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
77

88
"github.com/cosmos/ibc-go/modules/apps/callbacks/types"
99
transfertypes "github.com/cosmos/ibc-go/v9/modules/apps/transfer/types"

‎modules/apps/transfer/keeper/msg_server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
minttypes "cosmossdk.io/x/mint/types"
1010
sdk "github.com/cosmos/cosmos-sdk/types"
1111

12-
abci "github.com/cometbft/cometbft/abci/types"
12+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1313

1414
"github.com/cosmos/ibc-go/v9/modules/apps/transfer/types"
1515
clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"

‎modules/apps/transfer/keeper/relay_forwarding_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
sdk "github.com/cosmos/cosmos-sdk/types"
1414

15-
abci "github.com/cometbft/cometbft/abci/types"
15+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1616

1717
internaltypes "github.com/cosmos/ibc-go/v9/modules/apps/transfer/internal/types"
1818
"github.com/cosmos/ibc-go/v9/modules/apps/transfer/types"

‎modules/core/02-client/keeper/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
1010
sdk "github.com/cosmos/cosmos-sdk/types"
1111

12-
abci "github.com/cometbft/cometbft/abci/types"
12+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1313

1414
clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
1515
commitmenttypes "github.com/cosmos/ibc-go/v9/modules/core/23-commitment/types"

‎modules/core/04-channel/keeper/packet_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
sdk "github.com/cosmos/cosmos-sdk/types"
99

10-
abci "github.com/cometbft/cometbft/abci/types"
10+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1111

1212
clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
1313
connectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"

‎modules/core/04-channel/keeper/timeout_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
sdk "github.com/cosmos/cosmos-sdk/types"
1010

11-
abci "github.com/cometbft/cometbft/abci/types"
11+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1212

1313
clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
1414
connectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"

‎modules/core/04-channel/types/acknowledgement_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77

88
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
99

10-
abcitypes "github.com/cometbft/cometbft/abci/types"
1110
cmtstate "github.com/cometbft/cometbft/state"
1211

1312
"github.com/cosmos/ibc-go/v9/modules/core/04-channel/types"

‎modules/core/keeper/msg_server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
sdk "github.com/cosmos/cosmos-sdk/types"
1111
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1212

13-
abci "github.com/cometbft/cometbft/abci/types"
13+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1414

1515
clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
1616
connectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"

‎modules/light-clients/08-wasm/keeper/querier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
sdk "github.com/cosmos/cosmos-sdk/types"
1414

15-
abci "github.com/cometbft/cometbft/abci/types"
15+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1616

1717
"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
1818
)

‎modules/light-clients/08-wasm/testing/simapp/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ import (
101101
"github.com/cosmos/cosmos-sdk/x/genutil"
102102
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
103103

104-
abci "github.com/cometbft/cometbft/abci/types"
104+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
105105
cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
106106
cmtos "github.com/cometbft/cometbft/libs/os"
107107

‎modules/light-clients/08-wasm/testing/simapp/test_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
sdk "github.com/cosmos/cosmos-sdk/types"
2323
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
2424

25-
abci "github.com/cometbft/cometbft/abci/types"
25+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
2626
cmttypes "github.com/cometbft/cometbft/types"
2727

2828
wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"

‎simapp/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ import (
9999
"github.com/cosmos/cosmos-sdk/x/genutil"
100100
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
101101

102-
abci "github.com/cometbft/cometbft/abci/types"
102+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
103103

104104
"github.com/cosmos/ibc-go/modules/capability"
105105
capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"

‎testing/chain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
sdk "github.com/cosmos/cosmos-sdk/types"
2121
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
2222

23-
abci "github.com/cometbft/cometbft/abci/types"
23+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
2424
cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
2525
cmtprotoversion "github.com/cometbft/cometbft/api/cometbft/version/v1"
2626
"github.com/cometbft/cometbft/crypto/tmhash"

‎testing/endpoint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/cosmos/cosmos-sdk/baseapp"
1212
sdk "github.com/cosmos/cosmos-sdk/types"
1313

14-
abci "github.com/cometbft/cometbft/abci/types"
14+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1515

1616
clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
1717
connectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"

‎testing/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
testifysuite "github.com/stretchr/testify/suite"
1111

12-
abci "github.com/cometbft/cometbft/abci/types"
12+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1313

1414
clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
1515
connectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"

‎testing/events_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/stretchr/testify/require"
88

9-
abci "github.com/cometbft/cometbft/abci/types"
9+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
1010

1111
"github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
1212
channeltypes "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types"

‎testing/path.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"errors"
66

7-
abci "github.com/cometbft/cometbft/abci/types"
7+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
88

99
transfertypes "github.com/cosmos/ibc-go/v9/modules/apps/transfer/types"
1010
channeltypes "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types"

‎testing/simapp/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ import (
8585
"github.com/cosmos/cosmos-sdk/x/genutil"
8686
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
8787

88-
abci "github.com/cometbft/cometbft/abci/types"
88+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
8989

9090
"github.com/cosmos/ibc-go/modules/capability"
9191
capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"

‎testing/simapp/test_helpers.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
sdk "github.com/cosmos/cosmos-sdk/types"
2626
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
2727

28-
abci "github.com/cometbft/cometbft/abci/types"
28+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
2929
cmttypes "github.com/cometbft/cometbft/types"
3030
)
3131

@@ -91,7 +91,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *cmttypes.ValidatorSet, genAccs
9191
require.NoError(t, err)
9292

9393
// init chain will set the validator set and initialize the genesis accounts
94-
_, err = app.InitChain(&abci.RequestInitChain{
94+
_, err = app.InitChain(&abci.InitChainRequest{
9595
Validators: []abci.ValidatorUpdate{},
9696
ConsensusParams: simtestutil.DefaultConsensusParams,
9797
AppStateBytes: stateBytes,
@@ -109,7 +109,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *cmttypes.ValidatorSet, genAccs
109109
func SignAndDeliver(
110110
tb testing.TB, txCfg client.TxConfig, app *bam.BaseApp, msgs []sdk.Msg,
111111
chainID string, accNums, accSeqs []uint64, expPass bool, blockTime time.Time, nextValHash []byte, priv ...cryptotypes.PrivKey,
112-
) (*abci.ResponseFinalizeBlock, error) {
112+
) (*abci.FinalizeBlockResponse, error) {
113113
tb.Helper()
114114
tx, err := simtestutil.GenSignedMockTx(
115115
rand.New(rand.NewSource(time.Now().UnixNano())),
@@ -127,7 +127,7 @@ func SignAndDeliver(
127127
txBytes, err := txCfg.TxEncoder()(tx)
128128
require.NoError(tb, err)
129129

130-
return app.FinalizeBlock(&abci.RequestFinalizeBlock{
130+
return app.FinalizeBlock(&abci.FinalizeBlockRequest{
131131
Height: app.LastBlockHeight() + 1,
132132
Time: blockTime,
133133
NextValidatorsHash: nextValHash,

‎testing/testing_app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
sdk "github.com/cosmos/cosmos-sdk/types"
2525
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
2626

27-
abci "github.com/cometbft/cometbft/abci/types"
27+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
2828
cmttypes "github.com/cometbft/cometbft/types"
2929

3030
capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
@@ -127,7 +127,7 @@ func SetupWithGenesisValSet(tb testing.TB, valSet *cmttypes.ValidatorSet, genAcc
127127

128128
// init chain will set the validator set and initialize the genesis accounts
129129
_, err = app.InitChain(
130-
&abci.RequestInitChain{
130+
&abci.InitChainRequest{
131131
ChainId: chainID,
132132
Validators: []abci.ValidatorUpdate{},
133133
AppStateBytes: stateBytes,

‎testing/utils.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import (
1313
"github.com/cosmos/cosmos-sdk/codec"
1414
sdk "github.com/cosmos/cosmos-sdk/types"
1515

16-
abci "github.com/cometbft/cometbft/abci/types"
16+
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
17+
1718
cmttypes "github.com/cometbft/cometbft/types"
1819
)
1920

0 commit comments

Comments
 (0)