chore: Remove unused channel keeper from IBCv1 msg handler (#2190)

Author: kulikthebird

x/wasm/keeper/handler_plugin.go

@@ -40,7 +40,6 @@ func NewDefaultMessageHandler(
 	keeper *Keeper,
 	router MessageRouter,
 	ics4Wrapper types.ICS4Wrapper,
-	channelKeeper types.ChannelKeeper,
 	bankKeeper types.Burner,
 	cdc codec.Codec,
 	portSource types.ICS20TransferPortSource,
@@ -52,7 +51,7 @@ func NewDefaultMessageHandler(
 	}
 	return NewMessageHandlerChain(
 		NewSDKMessageHandler(cdc, router, encoders),
-		NewIBCRawPacketHandler(ics4Wrapper, keeper, channelKeeper),
+		NewIBCRawPacketHandler(ics4Wrapper, keeper),
 		NewBurnCoinMessageHandler(bankKeeper),
 	)
 }
@@ -172,17 +171,15 @@ func (m MessageHandlerChain) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAd
 
 // IBCRawPacketHandler handles IBC.SendPacket messages which are published to an IBC channel.
 type IBCRawPacketHandler struct {
-	ics4Wrapper   types.ICS4Wrapper
-	wasmKeeper    types.IBCContractKeeper
-	channelKeeper types.ChannelKeeper
+	ics4Wrapper types.ICS4Wrapper
+	wasmKeeper  types.IBCContractKeeper
 }
 
 // NewIBCRawPacketHandler constructor
-func NewIBCRawPacketHandler(ics4Wrapper types.ICS4Wrapper, wasmKeeper types.IBCContractKeeper, channelKeeper types.ChannelKeeper) IBCRawPacketHandler {
+func NewIBCRawPacketHandler(ics4Wrapper types.ICS4Wrapper, wasmKeeper types.IBCContractKeeper) IBCRawPacketHandler {
 	return IBCRawPacketHandler{
-		ics4Wrapper:   ics4Wrapper,
-		wasmKeeper:    wasmKeeper,
-		channelKeeper: channelKeeper,
+		ics4Wrapper: ics4Wrapper,
+		wasmKeeper:  wasmKeeper,
 	}
 }
 

x/wasm/keeper/handler_plugin_test.go

@@ -268,16 +268,6 @@ func TestIBCRawPacketHandler(t *testing.T) {
 			return nil
 		},
 	}
-	chanKeeper := &wasmtesting.MockChannelKeeper{
-		GetChannelFn: func(ctx sdk.Context, srcPort, srcChan string) (channeltypes.Channel, bool) {
-			return channeltypes.Channel{
-				Counterparty: channeltypes.NewCounterparty(
-					"other-port",
-					"other-channel-1",
-				),
-			}, true
-		},
-	}
 	contractKeeper := wasmtesting.IBCContractKeeperMock{}
 	// also store a packet to be acked
 	ackPacket := channeltypes.Packet{
@@ -297,7 +287,6 @@ func TestIBCRawPacketHandler(t *testing.T) {
 
 	specs := map[string]struct {
 		srcMsg        wasmvmtypes.IBCMsg
-		chanKeeper    types.ChannelKeeper
 		expPacketSent *CapturedPacket
 		expPacketAck  *CapturedPacket
 		expAck        []byte
@@ -312,7 +301,6 @@ func TestIBCRawPacketHandler(t *testing.T) {
 					Timeout:   wasmvmtypes.IBCTimeout{Block: &wasmvmtypes.IBCTimeoutBlock{Revision: 1, Height: 2}},
 				},
 			},
-			chanKeeper: chanKeeper,
 			expPacketSent: &CapturedPacket{
 				sourcePort:    ibcPort,
 				sourceChannel: "channel-1",
@@ -329,7 +317,6 @@ func TestIBCRawPacketHandler(t *testing.T) {
 					Ack:            wasmvmtypes.IBCAcknowledgement{Data: []byte("myAck")},
 				},
 			},
-			chanKeeper: chanKeeper,
 			expPacketAck: &CapturedPacket{
 				sourcePort:       ackPacket.SourcePort,
 				sourceChannel:    ackPacket.SourceChannel,
@@ -348,7 +335,7 @@ func TestIBCRawPacketHandler(t *testing.T) {
 			capturedPacketAck = nil
 
 			// when
-			h := NewIBCRawPacketHandler(capturingICS4Mock, &contractKeeper, spec.chanKeeper)
+			h := NewIBCRawPacketHandler(capturingICS4Mock, &contractKeeper)
 			evts, data, msgResponses, gotErr := h.DispatchMsg(ctx, RandomAccountAddress(t), ibcPort, wasmvmtypes.CosmosMsg{IBC: &spec.srcMsg}) //nolint:gosec
 
 			// then

x/wasm/keeper/keeper_cgo.go

@@ -60,7 +60,7 @@ func NewKeeper(
 		wasmLimits:  vmConfig.WasmLimits,
 		ibcRouterV2: ibcRouterV2,
 	}
-	keeper.messenger = NewDefaultMessageHandler(keeper, router, ics4Wrapper, channelKeeper, bankKeeper, cdc, portSource)
+	keeper.messenger = NewDefaultMessageHandler(keeper, router, ics4Wrapper, bankKeeper, cdc, portSource)
 	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distrKeeper, channelKeeper, keeper)
 	preOpts, postOpts := splitOpts(opts)
 	for _, o := range preOpts {

x/wasm/keeper/keeper_test.go

@@ -848,7 +848,7 @@ func TestInstantiateWithContractFactoryChildQueriesParent(t *testing.T) {
 	router := baseapp.NewMsgServiceRouter()
 	router.SetInterfaceRegistry(keepers.EncodingConfig.InterfaceRegistry)
 	types.RegisterMsgServer(router, NewMsgServerImpl(keeper))
-	keeper.messenger = NewDefaultMessageHandler(nil, router, nil, nil, nil, keepers.EncodingConfig.Codec, nil)
+	keeper.messenger = NewDefaultMessageHandler(nil, router, nil, nil, keepers.EncodingConfig.Codec, nil)
 	// overwrite wasmvm in response handler
 	keeper.wasmVMResponseHandler = NewDefaultWasmVMContractResponseHandler(NewMessageDispatcher(keeper.messenger, keeper))