rename CodeData -> Code and ContractData -> Contract

x/wasm/internal/keeper/genesis.go

@@ -41,7 +41,7 @@ func ExportGenesis(ctx sdk.Context, keeper Keeper) types.GenesisState {
 		if err != nil {
 			panic(err)
 		}
-		genState.Codes = append(genState.Codes, types.CodeData{
+		genState.Codes = append(genState.Codes, types.Code{
 			CodeInfo:   *keeper.GetCodeInfo(ctx, i),
 			CodesBytes: bytecode,
 		})
@@ -58,7 +58,7 @@ func ExportGenesis(ctx sdk.Context, keeper Keeper) types.GenesisState {
 			state = append(state, m)
 		}
 
-		genState.Contracts = append(genState.Contracts, types.ContractData{
+		genState.Contracts = append(genState.Contracts, types.Contract{
 			ContractAddress: addr,
 			ContractInfo:    contract,
 			ContractState:   state,

x/wasm/internal/types/genesis.go

@@ -1,26 +1,9 @@
 package types
 
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
 // GenesisState is the struct representation of the export genesis
 type GenesisState struct {
-	Codes     []CodeData     `json:"codes"`
-	Contracts []ContractData `json:"contracts"`
-}
-
-// CodeData struct encompasses CodeInfo and CodeBytes
-type CodeData struct {
-	CodeInfo   CodeInfo `json:"code_info"`
-	CodesBytes []byte   `json:"code_bytes"`
-}
-
-// ContractData struct encompasses ContractAddress, ContractInfo, and ContractState
-type ContractData struct {
-	ContractAddress sdk.AccAddress `json:"contract_address"`
-	ContractInfo    ContractInfo   `json:"contract_info"`
-	ContractState   []Model        `json:"contract_state"`
+	Codes     []Code     `json:"codes"`
+	Contracts []Contract `json:"contracts"`
 }
 
 // ValidateGenesis performs basic validation of supply genesis data returning an

x/wasm/internal/types/types.go

@@ -12,6 +12,12 @@ type Model struct {
 	Value string `json:"value"`
 }
 
+// CodeData struct encompasses CodeInfo and CodeBytes
+type Code struct {
+	CodeInfo   CodeInfo `json:"code_info"`
+	CodesBytes []byte   `json:"code_bytes"`
+}
+
 // CodeInfo is data for the uploaded contract WASM code
 type CodeInfo struct {
 	CodeHash []byte         `json:"code_hash"`
@@ -26,6 +32,13 @@ func NewCodeInfo(codeHash []byte, creator sdk.AccAddress) CodeInfo {
 	}
 }
 
+// ContractData struct encompasses ContractAddress, ContractInfo, and ContractState
+type Contract struct {
+	ContractAddress sdk.AccAddress `json:"contract_address"`
+	ContractInfo    ContractInfo   `json:"contract_info"`
+	ContractState   []Model        `json:"contract_state"`
+}
+
 // Contract stores a WASM contract instance
 type ContractInfo struct {
 	CodeID  uint64         `json:"code_id"`