move Code and Contract to genesis.go

CosmWasm · Jan 11, 2020 · 1956070 · 1956070
1 parent 0ce1b42
commit 1956070
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/x/wasm/internal/types/genesis.go b/x/wasm/internal/types/genesis.go
@@ -1,11 +1,26 @@
 package types
 
+import sdk "github.com/cosmos/cosmos-sdk/types"
+
 // GenesisState is the struct representation of the export genesis
 type GenesisState struct {
 	Codes     []Code     `json:"codes"`
 	Contracts []Contract `json:"contracts"`
 }
 
+// Code struct encompasses CodeInfo and CodeBytes
+type Code struct {
+	CodeInfo   CodeInfo `json:"code_info"`
+	CodesBytes []byte   `json:"code_bytes"`
+}
+
+// Contract 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"`
+}
+
 // ValidateGenesis performs basic validation of supply genesis data returning an
 // error for any failed validation criteria.
 func ValidateGenesis(data GenesisState) error {

diff --git a/x/wasm/internal/types/types.go b/x/wasm/internal/types/types.go
@@ -12,12 +12,6 @@ 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"`
@@ -32,14 +26,7 @@ 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
+// ContractInfo stores a WASM contract instance
 type ContractInfo struct {
 	CodeID  uint64         `json:"code_id"`
 	Creator sdk.AccAddress `json:"creator"`