smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-26 00:05:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x/authz v17 migration (#1217)

Browse Source
This commit is contained in:
Draco Li 2022-04-22 11:58:55 -04:00 committed by GitHub
parent de0e164632
commit 812b03af2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
migrate/go.mod → migrate/v0_16/go.mod
View File

5
migrate/v0_17/kava.go
View File

@ -3,6 +3,7 @@ package v0_17
import ( import (
"github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client"
authz "github.com/cosmos/cosmos-sdk/x/authz"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
evmtypes "github.com/tharsis/ethermint/x/evm/types" evmtypes "github.com/tharsis/ethermint/x/evm/types"
feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types"
@ -33,4 +34,8 @@ func migrateAppState(appState genutiltypes.AppMap, clientCtx client.Context) {
// x/feemarket // x/feemarket
feemarketState := feemarkettypes.DefaultGenesisState() feemarketState := feemarkettypes.DefaultGenesisState()
appState[feemarkettypes.ModuleName] = codec.MustMarshalJSON(feemarketState) appState[feemarkettypes.ModuleName] = codec.MustMarshalJSON(feemarketState)
// x/authz
authzState := authz.DefaultGenesisState()
appState[authz.ModuleName] = codec.MustMarshalJSON(authzState)
} }

19
migrate/v0_17/migrate_test.go
View File

@ -9,6 +9,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client"
authz "github.com/cosmos/cosmos-sdk/x/authz"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
tmjson "github.com/tendermint/tendermint/libs/json" tmjson "github.com/tendermint/tendermint/libs/json"
tmtypes "github.com/tendermint/tendermint/types" tmtypes "github.com/tendermint/tendermint/types"
@ -33,7 +34,7 @@ func TestMigrateGenesisDoc(t *testing.T) {
} }
func TestMigrateEvmUtil(t *testing.T) { func TestMigrateEvmUtil(t *testing.T) {
appMap, ctx := migrateToV16AndGetAppMap(t) appMap, ctx := migrateToV17AndGetAppMap(t)
var genstate evmutiltypes.GenesisState var genstate evmutiltypes.GenesisState
err := ctx.Codec.UnmarshalJSON(appMap[evmutiltypes.ModuleName], &genstate) err := ctx.Codec.UnmarshalJSON(appMap[evmutiltypes.ModuleName], &genstate)
assert.NoError(t, err) assert.NoError(t, err)
@ -41,7 +42,7 @@ func TestMigrateEvmUtil(t *testing.T) {
} }
func TestMigrateEvm(t *testing.T) { func TestMigrateEvm(t *testing.T) {
appMap, ctx := migrateToV16AndGetAppMap(t) appMap, ctx := migrateToV17AndGetAppMap(t)
var genstate evmtypes.GenesisState var genstate evmtypes.GenesisState
err := ctx.Codec.UnmarshalJSON(appMap[evmtypes.ModuleName], &genstate) err := ctx.Codec.UnmarshalJSON(appMap[evmtypes.ModuleName], &genstate)
assert.NoError(t, err) assert.NoError(t, err)
@ -56,14 +57,24 @@ func TestMigrateEvm(t *testing.T) {
} }
func TestMigrateFeeMarket(t *testing.T) { func TestMigrateFeeMarket(t *testing.T) {
appMap, ctx := migrateToV16AndGetAppMap(t) appMap, ctx := migrateToV17AndGetAppMap(t)
var genstate feemarkettypes.GenesisState var genstate feemarkettypes.GenesisState
err := ctx.Codec.UnmarshalJSON(appMap[feemarkettypes.ModuleName], &genstate) err := ctx.Codec.UnmarshalJSON(appMap[feemarkettypes.ModuleName], &genstate)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, genstate, *feemarkettypes.DefaultGenesisState()) assert.Equal(t, genstate, *feemarkettypes.DefaultGenesisState())
} }
func migrateToV16AndGetAppMap(t *testing.T) (genutiltypes.AppMap, client.Context) { func TestMigrateAuthz(t *testing.T) {
appMap, ctx := migrateToV17AndGetAppMap(t)
var genstate authz.GenesisState
err := ctx.Codec.UnmarshalJSON(appMap[authz.ModuleName], &genstate)
assert.NoError(t, err)
assert.Equal(t, genstate, authz.GenesisState{
Authorization: []authz.GrantAuthorization{},
})
}
func migrateToV17AndGetAppMap(t *testing.T) (genutiltypes.AppMap, client.Context) {
genDoc, err := tmtypes.GenesisDocFromFile(filepath.Join("testdata", "genesis-v16.json")) genDoc, err := tmtypes.GenesisDocFromFile(filepath.Join("testdata", "genesis-v16.json"))
assert.NoError(t, err) assert.NoError(t, err)

3
migrate/v0_17/testdata/genesis-v17.json vendored
View File

@ -2219,6 +2219,9 @@
"base_fee": "1000000000" "base_fee": "1000000000"
}, },
"block_gas": "0" "block_gas": "0"
},
"authz": {
"authorization": []
} }
} }
} }