fix: remove proto message registration from legacy v09 types to fix c…

…onflict (#1023) with existing types Co-authored-by: Federico Kunze Küllmer <[email protected]>
evmos · Apr 5, 2022 · ea3c16e · ea3c16e
1 parent 56c4a31
commit ea3c16e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/x/feemarket/migrations/v010/migrate_test.go b/x/feemarket/migrations/v010/migrate_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/tharsis/ethermint/app"
 	feemarketkeeper "github.com/tharsis/ethermint/x/feemarket/keeper"
 	v010 "github.com/tharsis/ethermint/x/feemarket/migrations/v010"
+	v09types "github.com/tharsis/ethermint/x/feemarket/migrations/v09/types"
 	"github.com/tharsis/ethermint/x/feemarket/types"
 	feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types"
 )
@@ -44,3 +45,25 @@ func TestMigrateStore(t *testing.T) {
 
 	require.Equal(t, baseFee.Int64(), params.BaseFee.Int64())
 }
+
+func TestMigrateJSON(t *testing.T) {
+	rawJson := `{
+		"base_fee": "669921875",
+		"block_gas": "0",
+		"params": {
+			"base_fee_change_denominator": 8,
+			"elasticity_multiplier": 2,
+			"enable_height": "0",
+			"initial_base_fee": "1000000000",
+			"no_base_fee": false
+		}
+  }`
+	encCfg := encoding.MakeConfig(app.ModuleBasics)
+	var genState v09types.GenesisState
+	err := encCfg.Marshaler.UnmarshalJSON([]byte(rawJson), &genState)
+	require.NoError(t, err)
+
+	migratedGenState := v010.MigrateJSON(genState)
+
+	require.Equal(t, int64(669921875), migratedGenState.Params.BaseFee.Int64())
+}
diff --git a/x/feemarket/migrations/v09/types/feemarket.pb copy.go b/x/feemarket/migrations/v09/types/feemarket.pb copy.go
diff --git a/x/feemarket/migrations/v09/types/genesis.pb copy.go b/x/feemarket/migrations/v09/types/genesis.pb copy.go