Merge pull request cosmos#17 from crodriguezvega/carlos/sdk-module-fo…

…lder-structure

chore: relocating files to follow sdk module folder structure

modules/core/client/cli/cli.go

@@ -8,7 +8,6 @@ import (
 	connection "github.com/cosmos/ibc-go/v7/modules/core/03-connection"
 	channel "github.com/cosmos/ibc-go/v7/modules/core/04-channel"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
-	wasmcli "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/cli"
 )
 
 // GetTxCmd returns the transaction commands for this module
@@ -24,7 +23,6 @@ func GetTxCmd() *cobra.Command {
 	ibcTxCmd.AddCommand(
 		ibcclient.GetTxCmd(),
 		channel.GetTxCmd(),
-		wasmcli.NewTxCmd(),
 	)
 
 	return ibcTxCmd
@@ -45,7 +43,6 @@ func GetQueryCmd() *cobra.Command {
 		ibcclient.GetQueryCmd(),
 		connection.GetQueryCmd(),
 		channel.GetQueryCmd(),
-		wasmcli.GetQueryCmd(),
 	)
 
 	return ibcQueryCmd

modules/core/keeper/grpc_query.go

@@ -6,14 +6,8 @@ import (
 	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-	wasm "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
 )
 
-// WasmCode implements the IBC QueryServer interface
-func (q Keeper) WasmCode(c context.Context, req *wasm.WasmCodeQuery) (*wasm.WasmCodeResponse, error) {
-	return q.WasmClientKeeper.WasmCode(c, req)
-}
-
 // ClientState implements the IBC QueryServer interface
 func (q Keeper) ClientState(c context.Context, req *clienttypes.QueryClientStateRequest) (*clienttypes.QueryClientStateResponse, error) {
 	return q.ClientKeeper.ClientState(c, req)

modules/core/keeper/keeper.go

@@ -17,7 +17,7 @@ import (
 	portkeeper "github.com/cosmos/ibc-go/v7/modules/core/05-port/keeper"
 	porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
 	"github.com/cosmos/ibc-go/v7/modules/core/types"
-	wasmkeeper "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
+	wasmkeeper "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper"
 )
 
 var _ types.QueryServer = (*Keeper)(nil)

modules/core/keeper/msg_server.go

@@ -2,7 +2,6 @@ package keeper
 
 import (
 	"context"
-	"encoding/hex"
 
 	metrics "github.com/armon/go-metrics"
 	"github.com/cosmos/cosmos-sdk/telemetry"
@@ -14,39 +13,14 @@ import (
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
 	coretypes "github.com/cosmos/ibc-go/v7/modules/core/types"
-	wasm "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
 )
 
 var (
 	_ clienttypes.MsgServer     = Keeper{}
 	_ connectiontypes.MsgServer = Keeper{}
 	_ channeltypes.MsgServer    = Keeper{}
-	_ wasm.MsgServer            = Keeper{}
 )
 
-// PushNewWasmCode defines a rpc handler method for MsgPushNewWasmCode
-func (k Keeper) PushNewWasmCode(goCtx context.Context, msg *wasm.MsgPushNewWasmCode) (*wasm.MsgPushNewWasmCodeResponse, error) {
-	ctx := sdk.UnwrapSDKContext(goCtx)
-
-	response, err := wasm.HandleMsgPushNewWasmCode(ctx, k.WasmClientKeeper, msg)
-	if err != nil {
-		return nil, err
-	}
-
-	ctx.EventManager().EmitEvents(sdk.Events{
-		sdk.NewEvent(
-			clienttypes.EventTypePushWasmCode,
-			sdk.NewAttribute(clienttypes.AttributeKeyWasmCodeID, hex.EncodeToString(response.CodeId)),
-		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, clienttypes.AttributeValueCategory),
-		),
-	})
-
-	return response, nil
-}
-
 // CreateClient defines a rpc handler method for MsgCreateClient.
 func (k Keeper) CreateClient(goCtx context.Context, msg *clienttypes.MsgCreateClient) (*clienttypes.MsgCreateClientResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)

modules/core/module.go

@@ -26,7 +26,6 @@ import (
 	"github.com/cosmos/ibc-go/v7/modules/core/keeper"
 	"github.com/cosmos/ibc-go/v7/modules/core/simulation"
 	"github.com/cosmos/ibc-go/v7/modules/core/types"
-	wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
 )
 
 var (
@@ -78,10 +77,6 @@ func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *r
 	if err != nil {
 		panic(err)
 	}
-	err = wasmclient.RegisterQueryHandlerClient(context.Background(), mux, wasmclient.NewQueryClient(clientCtx))
-	if err != nil {
-		panic(err)
-	}
 }
 
 // GetTxCmd returns the root tx command for the ibc module.
@@ -127,7 +122,6 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	clienttypes.RegisterMsgServer(cfg.MsgServer(), am.keeper)
 	connectiontypes.RegisterMsgServer(cfg.MsgServer(), am.keeper)
 	channeltypes.RegisterMsgServer(cfg.MsgServer(), am.keeper)
-	wasmclient.RegisterMsgServer(cfg.MsgServer(), am.keeper)
 	types.RegisterQueryService(cfg.QueryServer(), am.keeper)
 
 	m := clientkeeper.NewMigrator(am.keeper.ClientKeeper)

modules/core/types/query.go

@@ -9,21 +9,18 @@ import (
 	connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
 	channel "github.com/cosmos/ibc-go/v7/modules/core/04-channel"
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-	wasm "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
 )
 
 // QueryServer defines the IBC interfaces that the gRPC query server must implement
 type QueryServer interface {
 	clienttypes.QueryServer
 	connectiontypes.QueryServer
 	channeltypes.QueryServer
-	wasm.QueryServer
 }
 
 // RegisterQueryService registers each individual IBC submodule query service
 func RegisterQueryService(server grpc.Server, queryService QueryServer) {
 	client.RegisterQueryService(server, queryService)
 	connection.RegisterQueryService(server, queryService)
 	channel.RegisterQueryService(server, queryService)
-	wasm.RegisterQueryService(server, queryService)
 }

modules/light-clients/08-wasm/cli/cli.go → modules/light-clients/08-wasm/client/cli/cli.go

@@ -1,23 +1,25 @@
 package cli
 
 import (
-	"github.com/cosmos/cosmos-sdk/client"
-	wasm "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
 	"github.com/spf13/cobra"
+
+	"github.com/cosmos/cosmos-sdk/client"
+
+	types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types"
 )
 
 // GetQueryCmd returns the query commands for IBC channels
 func GetQueryCmd() *cobra.Command {
 	queryCmd := &cobra.Command{
-		Use:                        wasm.SubModuleName,
+		Use:                        types.SubModuleName,
 		Short:                      "IBC wasm manager module query subcommands",
 		DisableFlagParsing:         true,
 		SuggestionsMinimumDistance: 2,
 		RunE:                       client.ValidateCmd,
 	}
 
 	queryCmd.AddCommand(
-		GetCmdCode(),
+		getCmdCode(),
 	)
 
 	return queryCmd
@@ -26,15 +28,15 @@ func GetQueryCmd() *cobra.Command {
 // NewTxCmd returns a CLI command handler for all x/ibc channel transaction commands.
 func NewTxCmd() *cobra.Command {
 	txCmd := &cobra.Command{
-		Use:                        wasm.SubModuleName,
+		Use:                        types.SubModuleName,
 		Short:                      "IBC wasm manager module transaction subcommands",
 		DisableFlagParsing:         true,
 		SuggestionsMinimumDistance: 2,
 		RunE:                       client.ValidateCmd,
 	}
 
 	txCmd.AddCommand(
-		NewPushNewWasmCodeCmd(),
+		newPushNewWasmCodeCmd(),
 	)
 
 	return txCmd

modules/light-clients/08-wasm/cli/query.go → modules/light-clients/08-wasm/client/cli/query.go

@@ -8,29 +8,29 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/version"
 	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
-	wasm "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
+	"github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types"
 	"github.com/spf13/cobra"
 )
 
-// GetCmdCode defines the command to query wasm code for given code id
-func GetCmdCode() *cobra.Command {
+// getCmdCode defines the command to query wasm code for given code id
+func getCmdCode() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "code [code-id]",
 		Short: "Query wasm code",
 		Long:  "Query wasm code",
 		Example: fmt.Sprintf(
-			"%s query %s %s code [code-id]", version.AppName, host.SubModuleName, wasm.SubModuleName,
+			"%s query %s %s code [code-id]", version.AppName, host.SubModuleName, types.SubModuleName,
 		),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
 			if err != nil {
 				return err
 			}
-			queryClient := wasm.NewQueryClient(clientCtx)
+			queryClient := types.NewQueryClient(clientCtx)
 
 			codeID := args[0]
-			req := wasm.WasmCodeQuery{
+			req := types.WasmCodeQuery{
 				CodeId: codeID,
 			}
 

modules/light-clients/08-wasm/cli/tx.go → modules/light-clients/08-wasm/client/cli/tx.go

@@ -6,12 +6,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	wasm "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
 	"github.com/spf13/cobra"
+
+	types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types"
 )
 
-// NewPushNewWasmCodeCmd returns the command to create a PushNewWasmCode transaction
-func NewPushNewWasmCodeCmd() *cobra.Command {
+// newPushNewWasmCodeCmd returns the command to create a PushNewWasmCode transaction
+func newPushNewWasmCodeCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "push-wasm [wasm-file]",
 		Short: "Reads wasm code from the file and creates push transaction",
@@ -29,7 +30,7 @@ func NewPushNewWasmCodeCmd() *cobra.Command {
 				return err
 			}
 
-			msg := &wasm.MsgPushNewWasmCode{
+			msg := &types.MsgPushNewWasmCode{
 				Code:   code,
 				Signer: clientCtx.GetFromAddress().String(),
 			}

modules/light-clients/08-wasm/keeper/grpc_query.go

@@ -0,0 +1,14 @@
+package keeper
+
+import (
+	"context"
+
+	"github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types"
+)
+
+var _ types.QueryServer = Keeper{}
+
+// WasmCode implements the IBC QueryServer interface
+func (q Keeper) WasmCode(c context.Context, req *types.WasmCodeQuery) (*types.WasmCodeResponse, error) {
+	return q.getWasmCode(c, req)
+}