LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Migrate pieces of x/genutil missed in #6734 (#6860)

Browse Source 
* Migrate pieces of x/genutil missed in 6734

* Fix tests

* Fix lint

* Add test
This commit is contained in:
Aaron Craelius
2020-07-27 15:41:20 +00:00
committed by GitHub
parent 359e9a031c
commit bb8aabd4e1
5 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/genutil/types/codec.go
-23
View File
@@ -1,23 +0,0 @@
package types
import (
"github.com/cosmos/cosmos-sdk/codec"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
)
// ModuleCdc defines a generic sealed codec to be used throughout this module
var ModuleCdc *codec.Codec
// TODO: abstract genesis transactions registration back to staking
// required for genesis transactions
func init() {
ModuleCdc = codec.New()
stakingtypes.RegisterCodec(ModuleCdc)
authtypes.RegisterCodec(ModuleCdc)
sdk.RegisterCodec(ModuleCdc)
cryptocodec.RegisterCrypto(ModuleCdc)
ModuleCdc.Seal()
}
x/genutil/types/genesis_state.go
+6 -2
View File
@@ -38,10 +38,14 @@ func DefaultGenesisState() GenesisState {
// NewGenesisStateFromTx creates a new GenesisState object
// from auth transactions
func NewGenesisStateFromTx(genTxs []sdk.Tx) GenesisState {
func NewGenesisStateFromTx(txJSONEncoder sdk.TxEncoder, genTxs []sdk.Tx) GenesisState {
genTxsBz := make([]json.RawMessage, len(genTxs))
for i, genTx := range genTxs {
genTxsBz[i] = ModuleCdc.MustMarshalJSON(genTx)
var err error
genTxsBz[i], err = txJSONEncoder(genTx)
if err != nil {
panic(err)
}
}
return NewGenesisState(genTxsBz)
}
x/genutil/types/genesis_state_test.go
+4 -5
View File
@@ -9,7 +9,6 @@ import (
"github.com/tendermint/tendermint/crypto/ed25519"
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/simapp/params"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/genutil/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -42,13 +41,13 @@ func TestValidateGenesisMultipleMessages(t *testing.T) {
msg2 := stakingtypes.NewMsgCreateValidator(sdk.ValAddress(pk2.Address()), pk2,
sdk.NewInt64Coin(sdk.DefaultBondDenom, 50), desc, comm, sdk.OneInt())
txGen := params.MakeEncodingConfig().TxConfig
txGen := simapp.MakeEncodingConfig().TxConfig
txBuilder := txGen.NewTxBuilder()
err := txBuilder.SetMsgs(msg1, msg2)
require.NoError(t, err)
tx := txBuilder.GetTx()
genesisState := types.NewGenesisStateFromTx([]sdk.Tx{tx})
genesisState := types.NewGenesisStateFromTx(txGen.TxJSONEncoder(), []sdk.Tx{tx})
err = types.ValidateGenesis(genesisState, simapp.MakeEncodingConfig().TxConfig.TxJSONDecoder())
require.Error(t, err)
@@ -59,13 +58,13 @@ func TestValidateGenesisBadMessage(t *testing.T) {
msg1 := stakingtypes.NewMsgEditValidator(sdk.ValAddress(pk1.Address()), desc, nil, nil)
txGen := params.MakeEncodingConfig().TxConfig
txGen := simapp.MakeEncodingConfig().TxConfig
txBuilder := txGen.NewTxBuilder()
err := txBuilder.SetMsgs(msg1)
require.NoError(t, err)
tx := txBuilder.GetTx()
genesisState := types.NewGenesisStateFromTx([]sdk.Tx{tx})
genesisState := types.NewGenesisStateFromTx(txGen.TxJSONEncoder(), []sdk.Tx{tx})
err = types.ValidateGenesis(genesisState, simapp.MakeEncodingConfig().TxConfig.TxJSONDecoder())
require.Error(t, err)