Skip to content

Commit a9692e7

Browse files
tbruyelletbruyelle
committed
migrate ibchost to ibcexported
See cosmos/ibc-go#2982
1 parent 6a89e7f commit a9692e7

File tree

5 files changed

+31
-30
lines changed

5 files changed

+31
-30
lines changed

‎app/consumer-democracy/app.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ import (
7777
ibc "github.com/cosmos/ibc-go/v7/modules/core"
7878
ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
7979
porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
80-
ibchost "github.com/cosmos/ibc-go/v7/modules/core/24-host"
80+
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
8181
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
8282
ibctesting "github.com/cosmos/ibc-go/v7/testing"
8383
"github.com/gorilla/mux"
@@ -255,7 +255,7 @@ func New(
255255
keys := sdk.NewKVStoreKeys(
256256
authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
257257
minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
258-
govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
258+
govtypes.StoreKey, paramstypes.StoreKey, ibcexported.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
259259
evidencetypes.StoreKey, ibctransfertypes.StoreKey,
260260
capabilitytypes.StoreKey, authzkeeper.StoreKey,
261261
consumertypes.StoreKey,
@@ -293,7 +293,7 @@ func New(
293293
keys[capabilitytypes.StoreKey],
294294
memKeys[capabilitytypes.MemStoreKey],
295295
)
296-
scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName)
296+
scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName)
297297
scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
298298
scopedIBCConsumerKeeper := app.CapabilityKeeper.ScopeToModule(consumertypes.ModuleName)
299299
app.CapabilityKeeper.Seal()
@@ -402,8 +402,8 @@ func New(
402402

403403
app.IBCKeeper = ibckeeper.NewKeeper(
404404
appCodec,
405-
keys[ibchost.StoreKey],
406-
app.GetSubspace(ibchost.ModuleName),
405+
keys[ibcexported.StoreKey],
406+
app.GetSubspace(ibcexported.ModuleName),
407407
&app.ConsumerKeeper,
408408
app.UpgradeKeeper,
409409
scopedIBCKeeper,
@@ -521,7 +521,7 @@ func New(
521521
paramstypes.ModuleName,
522522
vestingtypes.ModuleName,
523523
ibctransfertypes.ModuleName,
524-
ibchost.ModuleName,
524+
ibcexported.ModuleName,
525525
consumertypes.ModuleName,
526526
)
527527
app.MM.SetOrderEndBlockers(
@@ -541,7 +541,7 @@ func New(
541541
upgradetypes.ModuleName,
542542
vestingtypes.ModuleName,
543543
ibctransfertypes.ModuleName,
544-
ibchost.ModuleName,
544+
ibcexported.ModuleName,
545545
consumertypes.ModuleName,
546546
)
547547

@@ -567,7 +567,7 @@ func New(
567567
paramstypes.ModuleName,
568568
upgradetypes.ModuleName,
569569
vestingtypes.ModuleName,
570-
ibchost.ModuleName,
570+
ibcexported.ModuleName,
571571
ibctransfertypes.ModuleName,
572572
consumertypes.ModuleName,
573573
)
@@ -930,7 +930,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
930930
paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(gov.ProvideKeyTable())
931931
paramsKeeper.Subspace(crisistypes.ModuleName)
932932
paramsKeeper.Subspace(ibctransfertypes.ModuleName)
933-
paramsKeeper.Subspace(ibchost.ModuleName)
933+
paramsKeeper.Subspace(ibcexported.ModuleName)
934934
paramsKeeper.Subspace(consumertypes.ModuleName)
935935

936936
return paramsKeeper

‎app/consumer/app.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ import (
7070
ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
7171
ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
7272
porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
73-
ibchost "github.com/cosmos/ibc-go/v7/modules/core/24-host"
73+
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
7474
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
7575
ibctesting "github.com/cosmos/ibc-go/v7/testing"
7676
appparams "github.com/cosmos/interchain-security/app/params"
@@ -215,7 +215,7 @@ func New(
215215

216216
keys := sdk.NewKVStoreKeys(
217217
authtypes.StoreKey, banktypes.StoreKey, slashingtypes.StoreKey,
218-
paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey,
218+
paramstypes.StoreKey, ibcexported.StoreKey, upgradetypes.StoreKey,
219219
evidencetypes.StoreKey, ibctransfertypes.StoreKey,
220220
capabilitytypes.StoreKey, feegrant.StoreKey, authzkeeper.StoreKey,
221221
ibcconsumertypes.StoreKey,
@@ -253,7 +253,7 @@ func New(
253253
keys[capabilitytypes.StoreKey],
254254
memKeys[capabilitytypes.MemStoreKey],
255255
)
256-
scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName)
256+
scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName)
257257
scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
258258
scopedIBCConsumerKeeper := app.CapabilityKeeper.ScopeToModule(ibcconsumertypes.ModuleName)
259259
app.CapabilityKeeper.Seal()
@@ -315,8 +315,8 @@ func New(
315315
)
316316
app.IBCKeeper = ibckeeper.NewKeeper(
317317
appCodec,
318-
keys[ibchost.StoreKey],
319-
app.GetSubspace(ibchost.ModuleName),
318+
keys[ibcexported.StoreKey],
319+
app.GetSubspace(ibcexported.ModuleName),
320320
&app.ConsumerKeeper,
321321
app.UpgradeKeeper,
322322
scopedIBCKeeper,
@@ -406,7 +406,7 @@ func New(
406406
capabilitytypes.ModuleName,
407407
crisistypes.ModuleName,
408408
ibctransfertypes.ModuleName,
409-
ibchost.ModuleName,
409+
ibcexported.ModuleName,
410410
authtypes.ModuleName,
411411
banktypes.ModuleName,
412412
slashingtypes.ModuleName,
@@ -420,7 +420,7 @@ func New(
420420
app.MM.SetOrderEndBlockers(
421421
crisistypes.ModuleName,
422422
ibctransfertypes.ModuleName,
423-
ibchost.ModuleName,
423+
ibcexported.ModuleName,
424424
feegrant.ModuleName,
425425
authz.ModuleName,
426426
capabilitytypes.ModuleName,
@@ -446,7 +446,7 @@ func New(
446446
banktypes.ModuleName,
447447
slashingtypes.ModuleName,
448448
crisistypes.ModuleName,
449-
ibchost.ModuleName,
449+
ibcexported.ModuleName,
450450
evidencetypes.ModuleName,
451451
ibctransfertypes.ModuleName,
452452
feegrant.ModuleName,
@@ -757,7 +757,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
757757
paramsKeeper.Subspace(slashingtypes.ModuleName)
758758
paramsKeeper.Subspace(crisistypes.ModuleName)
759759
paramsKeeper.Subspace(ibctransfertypes.ModuleName)
760-
paramsKeeper.Subspace(ibchost.ModuleName)
760+
paramsKeeper.Subspace(ibcexported.ModuleName)
761761
paramsKeeper.Subspace(ibcconsumertypes.ModuleName)
762762

763763
return paramsKeeper

‎app/provider/app.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ import (
8282
ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
8383
ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
8484
porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
85-
ibchost "github.com/cosmos/ibc-go/v7/modules/core/24-host"
85+
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
8686
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
8787
ibctesting "github.com/cosmos/ibc-go/v7/testing"
8888

@@ -256,7 +256,7 @@ func New(
256256
keys := sdk.NewKVStoreKeys(
257257
authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
258258
minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
259-
govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey,
259+
govtypes.StoreKey, paramstypes.StoreKey, ibcexported.StoreKey, upgradetypes.StoreKey,
260260
evidencetypes.StoreKey, ibctransfertypes.StoreKey,
261261
capabilitytypes.StoreKey,
262262
providertypes.StoreKey,
@@ -294,7 +294,7 @@ func New(
294294
keys[capabilitytypes.StoreKey],
295295
memKeys[capabilitytypes.MemStoreKey],
296296
)
297-
scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName)
297+
scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName)
298298
scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
299299
scopedIBCProviderKeeper := app.CapabilityKeeper.ScopeToModule(providertypes.ModuleName)
300300
app.CapabilityKeeper.Seal()
@@ -381,8 +381,8 @@ func New(
381381

382382
app.IBCKeeper = ibckeeper.NewKeeper(
383383
appCodec,
384-
keys[ibchost.StoreKey],
385-
app.GetSubspace(ibchost.ModuleName),
384+
keys[ibcexported.StoreKey],
385+
app.GetSubspace(ibcexported.ModuleName),
386386
app.StakingKeeper,
387387
app.UpgradeKeeper,
388388
scopedIBCKeeper,
@@ -420,7 +420,7 @@ func New(
420420
AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler).
421421
AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
422422
AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(&app.UpgradeKeeper)).
423-
AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
423+
AddRoute(ibcexported.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
424424
AddRoute(providertypes.RouterKey, ibcprovider.NewProviderProposalHandler(app.ProviderKeeper)).
425425
AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper))
426426

@@ -498,7 +498,7 @@ func New(
498498
govtypes.ModuleName,
499499
stakingtypes.ModuleName,
500500
ibctransfertypes.ModuleName,
501-
ibchost.ModuleName,
501+
ibcexported.ModuleName,
502502
authtypes.ModuleName,
503503
banktypes.ModuleName,
504504
distrtypes.ModuleName,
@@ -521,7 +521,7 @@ func New(
521521
govtypes.ModuleName,
522522
stakingtypes.ModuleName,
523523
ibctransfertypes.ModuleName,
524-
ibchost.ModuleName,
524+
ibcexported.ModuleName,
525525
capabilitytypes.ModuleName,
526526
authtypes.ModuleName,
527527
banktypes.ModuleName,
@@ -552,7 +552,7 @@ func New(
552552
govtypes.ModuleName,
553553
minttypes.ModuleName,
554554
crisistypes.ModuleName,
555-
ibchost.ModuleName,
555+
ibcexported.ModuleName,
556556
evidencetypes.ModuleName,
557557
ibctransfertypes.ModuleName,
558558
genutiltypes.ModuleName,
@@ -868,7 +868,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
868868
paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(gov.ProvideKeyTable())
869869
paramsKeeper.Subspace(crisistypes.ModuleName)
870870
paramsKeeper.Subspace(ibctransfertypes.ModuleName)
871-
paramsKeeper.Subspace(ibchost.ModuleName)
871+
paramsKeeper.Subspace(ibcexported.ModuleName)
872872
paramsKeeper.Subspace(providertypes.ModuleName)
873873

874874
return paramsKeeper

‎x/ccv/consumer/keeper/keeper.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
1717
channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
1818
host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
19+
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
1920

2021
tmtypes "github.com/cometbft/cometbft/abci/types"
2122
"github.com/cometbft/cometbft/libs/log"
@@ -121,7 +122,7 @@ func (k Keeper) mustValidateFields() {
121122

122123
// Logger returns a module-specific logger.
123124
func (k Keeper) Logger(ctx sdk.Context) log.Logger {
124-
return ctx.Logger().With("module", "x/"+host.ModuleName+"-"+types.ModuleName)
125+
return ctx.Logger().With("module", "x/"+ibcexported.ModuleName+"-"+types.ModuleName)
125126
}
126127

127128
func (k *Keeper) SetHooks(sh ccv.ConsumerHooks) *Keeper {

‎x/ccv/provider/keeper/keeper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (k Keeper) mustValidateFields() {
103103

104104
// Logger returns a module-specific logger.
105105
func (k Keeper) Logger(ctx sdk.Context) log.Logger {
106-
return ctx.Logger().With("module", "x/"+host.ModuleName+"-"+types.ModuleName)
106+
return ctx.Logger().With("module", "x/"+ibcexported.ModuleName+"-"+types.ModuleName)
107107
}
108108

109109
// IsBound checks if the CCV module is already bound to the desired port

0 commit comments

Comments
 (0)