chore: replace keeper methods #NTRN-268

app/app.go

@@ -748,6 +748,7 @@ func New(
 		memKeys[interchaintxstypes.MemStoreKey],
 		app.IBCKeeper.ChannelKeeper,
 		app.ICAControllerKeeper,
+		icacontrollerkeeper.NewMsgServerImpl(&app.ICAControllerKeeper),
 		contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper),
 		app.FeeKeeper,
 		app.BankKeeper,

app/upgrades/v4.0.0/upgrades.go

@@ -25,7 +25,7 @@ func CreateUpgradeHandler(
 	_ upgrades.StoreKeys,
 	_ codec.Codec,
 ) upgradetypes.UpgradeHandler {
-	return func(c context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+	return func(c context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
 		ctx := sdk.UnwrapSDKContext(c)
 
 		ctx.Logger().Info("Starting module migrations...")

proto/neutron/interchaintxs/v1/tx.proto

@@ -40,7 +40,12 @@ message MsgRegisterInterchainAccount {
 
 // MsgRegisterInterchainAccountResponse is the response type for
 // MsgRegisterInterchainAccount.
-message MsgRegisterInterchainAccountResponse {}
+message MsgRegisterInterchainAccountResponse {
+  option (gogoproto.goproto_getters) = false;
+
+  string channel_id = 1;
+  string port_id = 2;
+}
 
 // MsgSubmitTx defines the payload for Msg/SubmitTx
 message MsgSubmitTx {

testutil/interchaintxs/keeper/interchaintxs.go

@@ -26,6 +26,7 @@ func InterchainTxsKeeper(
 	managerKeeper types.WasmKeeper,
 	refunderKeeper types.FeeRefunderKeeper,
 	icaControllerKeeper types.ICAControllerKeeper,
+	icaControllerMsgServer types.ICAControllerMsgServer,
 	channelKeeper types.ChannelKeeper,
 	bankKeeper types.BankKeeper,
 	getFeeCollectorAddr types.GetFeeCollectorAddr,
@@ -48,6 +49,7 @@ func InterchainTxsKeeper(
 		memStoreKey,
 		channelKeeper,
 		icaControllerKeeper,
+		icaControllerMsgServer,
 		managerKeeper,
 		refunderKeeper,
 		bankKeeper,

wasmbinding/bindings/msg.go

@@ -93,7 +93,10 @@ type RegisterInterchainAccount struct {
 }
 
 // RegisterInterchainAccountResponse holds response for RegisterInterchainAccount.
-type RegisterInterchainAccountResponse struct{}
+type RegisterInterchainAccountResponse struct {
+	ChannelId string `json:"channel_id"`
+	PortId    string `json:"port_id"`
+}
 
 // RegisterInterchainQuery creates a query for remote chain.
 type RegisterInterchainQuery struct {

x/globalfee/client/cli/query.go

@@ -29,7 +29,7 @@ func GetCmdShowGlobalFeeParams() *cobra.Command {
 		Short: "Show globalfee params",
 		Long:  "Show globalfee requirement: minimum_gas_prices, bypass_min_fee_msg_types, max_total_bypass_minFee_msg_gas_usage",
 		Args:  cobra.ExactArgs(0),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
 			if err != nil {
 				return err

x/interchaintxs/genesis_test.go

@@ -16,7 +16,7 @@ func TestGenesis(t *testing.T) {
 		Params: types.DefaultParams(),
 	}
 
-	k, ctx := keepertest.InterchainTxsKeeper(t, nil, nil, nil, nil, nil, nil)
+	k, ctx := keepertest.InterchainTxsKeeper(t, nil, nil, nil, nil, nil, nil, nil)
 	interchaintxs.InitGenesis(ctx, *k, genesisState)
 	got := interchaintxs.ExportGenesis(ctx, *k)
 	require.NotNil(t, got)

x/interchaintxs/keeper/grpc_query_interchainaccount_test.go

@@ -19,7 +19,7 @@ func TestKeeper_InterchainAccountAddress(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl)
-	keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, icaKeeper, nil, nil, nil)
+	keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, icaKeeper, nil, nil, nil, nil)
 
 	resp, err := keeper.InterchainAccountAddress(ctx, nil)
 	require.ErrorIs(t, err, sdkerrors.ErrInvalidRequest)

x/interchaintxs/keeper/grpc_query_params_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestParamsQuery(t *testing.T) {
-	keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil, nil, nil)
+	keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil, nil, nil, nil)
 	params := types.DefaultParams()
 	err := keeper.SetParams(ctx, params)
 	require.NoError(t, err)

x/interchaintxs/keeper/ibc_handlers_test.go

@@ -26,11 +26,10 @@ const ICAId = ".ica0"
 func TestHandleAcknowledgement(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
-	icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl)
 	wmKeeper := mock_types.NewMockWasmKeeper(ctrl)
 	feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl)
 	bankKeeper := mock_types.NewMockBankKeeper(ctrl)
-	icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, func(_ sdk.Context) string {
+	icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, nil, nil, nil, bankKeeper, func(_ sdk.Context) string {
 		return TestFeeCollectorAddr
 	})
 	ctx := infCtx.WithGasMeter(types2.NewGasMeter(1_000_000_000_000))
@@ -76,11 +75,10 @@ func TestHandleAcknowledgement(t *testing.T) {
 func TestHandleTimeout(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
-	icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl)
 	wmKeeper := mock_types.NewMockWasmKeeper(ctrl)
 	feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl)
 	bankKeeper := mock_types.NewMockBankKeeper(ctrl)
-	icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, func(_ sdk.Context) string {
+	icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, nil, nil, nil, bankKeeper, func(_ sdk.Context) string {
 		return TestFeeCollectorAddr
 	})
 	ctx := infCtx.WithGasMeter(types2.NewGasMeter(1_000_000_000_000))
@@ -119,12 +117,12 @@ func TestHandleChanOpenAck(t *testing.T) {
 	defer ctrl.Finish()
 	wmKeeper := mock_types.NewMockWasmKeeper(ctrl)
 	bankKeeper := mock_types.NewMockBankKeeper(ctrl)
-	icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil, bankKeeper, func(_ sdk.Context) string {
+	icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil, nil, bankKeeper, func(_ sdk.Context) string {
 		return TestFeeCollectorAddr
 	})
 	portID := icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ICAId
 	contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)
-	channelID := "channel-0"
+	const channelID = "channel-0"
 	counterpartyChannelID := "channel-1"
 
 	err := icak.HandleChanOpenAck(ctx, "", channelID, counterpartyChannelID, "1")

x/interchaintxs/keeper/keeper.go

@@ -25,16 +25,17 @@ const (
 
 type (
 	Keeper struct {
-		Codec               codec.BinaryCodec
-		storeKey            storetypes.StoreKey
-		memKey              storetypes.StoreKey
-		channelKeeper       types.ChannelKeeper
-		feeKeeper           types.FeeRefunderKeeper
-		icaControllerKeeper types.ICAControllerKeeper
-		sudoKeeper          types.WasmKeeper
-		bankKeeper          types.BankKeeper
-		getFeeCollectorAddr types.GetFeeCollectorAddr
-		authority           string
+		Codec                  codec.BinaryCodec
+		storeKey               storetypes.StoreKey
+		memKey                 storetypes.StoreKey
+		channelKeeper          types.ChannelKeeper
+		feeKeeper              types.FeeRefunderKeeper
+		icaControllerKeeper    types.ICAControllerKeeper
+		icaControllerMsgServer types.ICAControllerMsgServer
+		sudoKeeper             types.WasmKeeper
+		bankKeeper             types.BankKeeper
+		getFeeCollectorAddr    types.GetFeeCollectorAddr
+		authority              string
 	}
 )
 
@@ -44,23 +45,25 @@ func NewKeeper(
 	memKey storetypes.StoreKey,
 	channelKeeper types.ChannelKeeper,
 	icaControllerKeeper types.ICAControllerKeeper,
+	icaControllerMsgServer types.ICAControllerMsgServer,
 	sudoKeeper types.WasmKeeper,
 	feeKeeper types.FeeRefunderKeeper,
 	bankKeeper types.BankKeeper,
 	getFeeCollectorAddr types.GetFeeCollectorAddr,
 	authority string,
 ) *Keeper {
 	return &Keeper{
-		Codec:               cdc,
-		storeKey:            storeKey,
-		memKey:              memKey,
-		channelKeeper:       channelKeeper,
-		icaControllerKeeper: icaControllerKeeper,
-		sudoKeeper:          sudoKeeper,
-		feeKeeper:           feeKeeper,
-		bankKeeper:          bankKeeper,
-		getFeeCollectorAddr: getFeeCollectorAddr,
-		authority:           authority,
+		Codec:                  cdc,
+		storeKey:               storeKey,
+		memKey:                 memKey,
+		channelKeeper:          channelKeeper,
+		icaControllerKeeper:    icaControllerKeeper,
+		icaControllerMsgServer: icaControllerMsgServer,
+		sudoKeeper:             sudoKeeper,
+		feeKeeper:              feeKeeper,
+		bankKeeper:             bankKeeper,
+		getFeeCollectorAddr:    getFeeCollectorAddr,
+		authority:              authority,
 	}
 }