fix(wasm): init params first in InitGenesis (#76)

cherry-pick: CosmWasm/wasmd@ae169ce
> Merge pull request Finschia#338 from CosmWasm/fix_genesis_335
>
> Fix param usage issue in genesis import

Co-authored-by: Alexander Peters <alpe@users.noreply.github.com>

internal/keeper/genesis.go

@@ -12,6 +12,8 @@ import (
 //
 // CONTRACT: all types of accounts must have been already initialized/created
 func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) error {
+	keeper.setParams(ctx, data.Params)
+
 	var maxCodeID uint64
 	for i, code := range data.Codes {
 		err := keeper.importCode(ctx, code.CodeID, code.CodeInfo, code.CodesBytes)
@@ -46,7 +48,6 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) error
 	if keeper.peekAutoIncrementID(ctx, types.KeyLastInstanceID) <= uint64(maxContractID) {
 		return sdkerrors.Wrapf(types.ErrInvalid, "seq %s must be greater %d ", string(types.KeyLastInstanceID), maxContractID)
 	}
-	keeper.setParams(ctx, data.Params)
 
 	return nil
 }

internal/keeper/genesis_test.go

@@ -34,13 +34,16 @@ import (
 const firstCodeID = 1
 
 func TestGenesisExportImport(t *testing.T) {
-	srcKeeper, srcCtx, srcStoreKeys, srcCleanup := setupKeeper(t)
-	defer srcCleanup()
+	srcKeeper, srcCtx, srcStoreKeys := setupKeeper(t)
+
 	wasmCode, err := ioutil.ReadFile("./testdata/hackatom.wasm")
 	require.NoError(t, err)
 
 	// store some test data
 	f := fuzz.New().Funcs(ModelFuzzers...)
+
+	srcKeeper.setParams(srcCtx, types.DefaultParams())
+
 	for i := 0; i < 25; i++ {
 		var (
 			codeInfo    types.CodeInfo
@@ -87,8 +90,7 @@ func TestGenesisExportImport(t *testing.T) {
 	})
 
 	// re-import
-	dstKeeper, dstCtx, dstStoreKeys, dstCleanup := setupKeeper(t)
-	defer dstCleanup()
+	dstKeeper, dstCtx, dstStoreKeys := setupKeeper(t)
 
 	var importState types.GenesisState
 	err = json.Unmarshal(exportedGenesis, &importState)
@@ -350,8 +352,7 @@ func TestFailFastImport(t *testing.T) {
 
 	for msg, spec := range specs {
 		t.Run(msg, func(t *testing.T) {
-			keeper, ctx, _, cleanup := setupKeeper(t)
-			defer cleanup()
+			keeper, ctx, _ := setupKeeper(t)
 
 			require.NoError(t, types.ValidateGenesis(spec.src))
 			got := InitGenesis(ctx, keeper, spec.src)
@@ -406,8 +407,7 @@ func TestImportContractWithCodeHistoryReset(t *testing.T) {
   {"id_key": %q, "value": "2"}
   ]
 }`
-	keeper, ctx, _, dstCleanup := setupKeeper(t)
-	defer dstCleanup()
+	keeper, ctx, _ := setupKeeper(t)
 
 	wasmCode, err := ioutil.ReadFile("./testdata/hackatom.wasm")
 	require.NoError(t, err)
@@ -475,12 +475,11 @@ func TestImportContractWithCodeHistoryReset(t *testing.T) {
 	assert.Equal(t, expHistory, keeper.GetContractHistory(ctx, contractAddr))
 }
 
-func setupKeeper(t *testing.T) (Keeper, sdk.Context, []sdk.StoreKey, func()) {
+func setupKeeper(t *testing.T) (Keeper, sdk.Context, []sdk.StoreKey) {
 	t.Helper()
 	tempDir, err := ioutil.TempDir("", "wasm")
 	require.NoError(t, err)
-	cleanup := func() { os.RemoveAll(tempDir) }
-	// t.Cleanup(cleanup) todo: add with Go 1.14
+	t.Cleanup(func() { os.RemoveAll(tempDir) })
 	var (
 		keyParams  = sdk.NewKVStoreKey(params.StoreKey)
 		tkeyParams = sdk.NewTransientStoreKey(params.TStoreKey)
@@ -502,7 +501,5 @@ func setupKeeper(t *testing.T) (Keeper, sdk.Context, []sdk.StoreKey, func()) {
 	pk := params.NewKeeper(cdc, keyParams, tkeyParams)
 	wasmConfig := types.DefaultWasmConfig()
 	srcKeeper := NewKeeper(cdc, keyWasm, pk.Subspace(types.DefaultParamspace), auth.AccountKeeper{}, nil, staking.Keeper{}, distribution.Keeper{}, nil, nil, nil, tempDir, wasmConfig, "", nil, nil)
-	srcKeeper.setParams(ctx, types.DefaultParams())
-
-	return srcKeeper, ctx, []sdk.StoreKey{keyWasm, keyParams}, cleanup
+	return srcKeeper, ctx, []sdk.StoreKey{keyWasm, keyParams}
 }