From 28e43dd116df44cc385ead393c31cca4745ccede Mon Sep 17 00:00:00 2001 From: rustdev Date: Wed, 22 May 2024 12:03:37 +0100 Subject: [PATCH] use custom pfm instead of original router. all test passed. --- app/app.go | 3 +-- app/keepers/keepers.go | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/app.go b/app/app.go index 6b4a4ed3c..cd385d224 100644 --- a/app/app.go +++ b/app/app.go @@ -88,7 +88,6 @@ import ( ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" - custompfm "github.com/notional-labs/composable/v6/custom/custompfm/keeper" customibctransfer "github.com/notional-labs/composable/v6/custom/ibc-transfer" customstaking "github.com/notional-labs/composable/v6/custom/staking" "github.com/spf13/cast" @@ -340,7 +339,7 @@ func NewComposableApp( enabledProposals, ) - custompfm.NewIBCMiddleware() + // custompfm.NewIBCMiddleware() // transferModule := transfer.NewAppModule(app.TransferKeeper) transferModule := customibctransfer.NewAppModule(appCodec, app.TransferKeeper, app.BankKeeper) routerModule := router.NewAppModule(app.RouterKeeper) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 588fea85f..613ecf540 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -70,7 +70,6 @@ import ( custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" - router "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" @@ -108,6 +107,7 @@ import ( stakingmiddleware "github.com/notional-labs/composable/v6/x/stakingmiddleware/keeper" stakingmiddlewaretypes "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" + custompfm "github.com/notional-labs/composable/v6/custom/custompfm/keeper" ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/keeper" ibctransfermiddlewaretypes "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) @@ -367,7 +367,8 @@ func (appKeepers *AppKeepers) InitNormalKeepers( appKeepers.TransferMiddlewareKeeper, ) - ibcMiddlewareStack := router.NewIBCMiddleware( + ibcMiddlewareStack := custompfm.NewIBCMiddleware( + // ibcMiddlewareStack := router.NewIBCMiddleware( transfermiddlewareStack, appKeepers.RouterKeeper, 0,