proto: migrate x/evidence to hybridcodec

simapp/app.go

@@ -175,7 +175,7 @@ func NewSimApp(
 		appCodec.Staking, keys[staking.StoreKey], app.BankKeeper, app.SupplyKeeper, app.subspaces[staking.ModuleName],
 	)
 	app.MintKeeper = mint.NewKeeper(
-		app.cdc, keys[mint.StoreKey], app.subspaces[mint.ModuleName], &stakingKeeper,
+		appCodec.Mint, keys[mint.StoreKey], app.subspaces[mint.ModuleName], &stakingKeeper,
 		app.SupplyKeeper, auth.FeeCollectorName,
 	)
 	app.DistrKeeper = distr.NewKeeper(
@@ -192,7 +192,7 @@ func NewSimApp(
 
 	// create evidence keeper with router
 	evidenceKeeper := evidence.NewKeeper(
-		app.cdc, keys[evidence.StoreKey], app.subspaces[evidence.ModuleName], &app.StakingKeeper, app.SlashingKeeper,
+		appCodec.Evidence, keys[evidence.StoreKey], app.subspaces[evidence.ModuleName], &app.StakingKeeper, app.SlashingKeeper,
 	)
 	evidenceRouter := evidence.NewRouter()
 	// TODO: Register evidence routes.

simapp/codec.go

@@ -5,6 +5,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
+	"github.com/cosmos/cosmos-sdk/x/evidence"
+	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 )
 
@@ -15,6 +17,8 @@ type AppCodec struct {
 
 	Staking      *staking.Codec
 	Distribution *distr.Codec
+	Mint         *mint.Codec
+	Evidence     *evidence.Codec
 }
 
 func NewAppCodec() *AppCodec {
@@ -24,6 +28,8 @@ func NewAppCodec() *AppCodec {
 		amino:        amino,
 		Staking:      staking.NewCodec(amino),
 		Distribution: distr.NewCodec(amino),
+		Mint:         mint.NewCodec(amino),
+		Evidence:     evidence.NewCodec(amino),
 	}
 }
 

x/evidence/alias.go

@@ -40,6 +40,7 @@ var (
 	KeyMaxEvidenceAge            = types.KeyMaxEvidenceAge
 	DoubleSignJailEndTime        = types.DoubleSignJailEndTime
 	ParamKeyTable                = types.ParamKeyTable
+	NewCodec                     = types.NewCodec
 )
 
 type (
@@ -50,4 +51,5 @@ type (
 	Handler           = types.Handler
 	Router            = types.Router
 	Equivocation      = types.Equivocation
+	Codec             = types.Codec
 )

x/evidence/client/cli/query.go

@@ -111,7 +111,7 @@ func queryEvidence(cdc *codec.Codec, cliCtx context.CLIContext, hash string) err
 		return err
 	}
 
-	var evidence exported.Evidence
+	var evidence exported.EvidenceI
 	err = cdc.UnmarshalJSON(res, &evidence)
 	if err != nil {
 		return fmt.Errorf("failed to unmarshal evidence: %w", err)
@@ -133,7 +133,7 @@ func queryAllEvidence(cdc *codec.Codec, cliCtx context.CLIContext) error {
 		return err
 	}
 
-	var evidence []exported.Evidence
+	var evidence []exported.EvidenceI
 	err = cdc.UnmarshalJSON(res, &evidence)
 	if err != nil {
 		return fmt.Errorf("failed to unmarshal evidence: %w", err)

x/evidence/exported/evidence.go

@@ -8,7 +8,7 @@ import (
 
 // Evidence defines the contract which concrete evidence types of misbehavior
 // must implement.
-type Evidence interface {
+type EvidenceI interface {
 	Route() string
 	Type() string
 	String() string

x/evidence/genesis_test.go

@@ -32,7 +32,7 @@ func (suite *GenesisTestSuite) SetupTest() {
 
 	// recreate keeper in order to use custom testing types
 	evidenceKeeper := evidence.NewKeeper(
-		cdc, app.GetKey(evidence.StoreKey), app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper,
+		types.ModuleCdc, app.GetKey(evidence.StoreKey), app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper,
 	)
 	router := evidence.NewRouter()
 	router = router.AddRoute(types.TestEvidenceRouteEquivocation, types.TestEquivocationHandler(*evidenceKeeper))
@@ -45,7 +45,7 @@ func (suite *GenesisTestSuite) SetupTest() {
 func (suite *GenesisTestSuite) TestInitGenesis_Valid() {
 	pk := ed25519.GenPrivKey()
 
-	testEvidence := make([]exported.Evidence, 100)
+	testEvidence := make([]exported.EvidenceI, 100)
 	for i := 0; i < 100; i++ {
 		sv := types.TestVote{
 			ValidatorAddress: pk.PubKey().Address(),
@@ -78,7 +78,7 @@ func (suite *GenesisTestSuite) TestInitGenesis_Valid() {
 func (suite *GenesisTestSuite) TestInitGenesis_Invalid() {
 	pk := ed25519.GenPrivKey()
 
-	testEvidence := make([]exported.Evidence, 100)
+	testEvidence := make([]exported.EvidenceI, 100)
 	for i := 0; i < 100; i++ {
 		sv := types.TestVote{
 			ValidatorAddress: pk.PubKey().Address(),

x/evidence/handler_test.go

@@ -31,7 +31,7 @@ func (suite *HandlerTestSuite) SetupTest() {
 
 	// recreate keeper in order to use custom testing types
 	evidenceKeeper := evidence.NewKeeper(
-		cdc, app.GetKey(evidence.StoreKey), app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper,
+		types.ModuleCdc, app.GetKey(evidence.StoreKey), app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper,
 	)
 	router := evidence.NewRouter()
 	router = router.AddRoute(types.TestEvidenceRouteEquivocation, types.TestEquivocationHandler(*evidenceKeeper))

x/evidence/internal/keeper/keeper.go

@@ -19,7 +19,7 @@ import (
 // managing persistence, state transitions and query handling for the evidence
 // module.
 type Keeper struct {
-	cdc            *codec.Codec
+	cdc            codec.Marshaler
 	storeKey       sdk.StoreKey
 	paramSpace     params.Subspace
 	router         types.Router
@@ -28,7 +28,7 @@ type Keeper struct {
 }
 
 func NewKeeper(
-	cdc *codec.Codec, storeKey sdk.StoreKey, paramSpace params.Subspace,
+	cdc codec.Marshaler, storeKey sdk.StoreKey, paramSpace params.Subspace,
 	stakingKeeper types.StakingKeeper, slashingKeeper types.SlashingKeeper,
 ) *Keeper {
 
@@ -83,7 +83,7 @@ func (k Keeper) GetEvidenceHandler(evidenceRoute string) (types.Handler, error)
 // the corresponding registered Evidence Handler. An error is returned if no
 // registered Handler exists or if the Handler fails. Otherwise, the evidence is
 // persisted.
-func (k Keeper) SubmitEvidence(ctx sdk.Context, evidence exported.Evidence) error {
+func (k Keeper) SubmitEvidence(ctx sdk.Context, evidence exported.EvidenceI) error {
 	if _, ok := k.GetEvidence(ctx, evidence.Hash()); ok {
 		return sdkerrors.Wrap(types.ErrEvidenceExists, evidence.Hash().String())
 	}
@@ -108,15 +108,15 @@ func (k Keeper) SubmitEvidence(ctx sdk.Context, evidence exported.Evidence) erro
 }
 
 // SetEvidence sets Evidence by hash in the module's KVStore.
-func (k Keeper) SetEvidence(ctx sdk.Context, evidence exported.Evidence) {
+func (k Keeper) SetEvidence(ctx sdk.Context, evidence exported.EvidenceI) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixEvidence)
 	bz := k.cdc.MustMarshalBinaryLengthPrefixed(evidence)
 	store.Set(evidence.Hash(), bz)
 }
 
 // GetEvidence retrieves Evidence by hash if it exists. If no Evidence exists for
 // the given hash, (nil, false) is returned.
-func (k Keeper) GetEvidence(ctx sdk.Context, hash tmbytes.HexBytes) (evidence exported.Evidence, found bool) {
+func (k Keeper) GetEvidence(ctx sdk.Context, hash tmbytes.HexBytes) (evidence exported.EvidenceI, found bool) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixEvidence)
 
 	bz := store.Get(hash)
@@ -131,13 +131,13 @@ func (k Keeper) GetEvidence(ctx sdk.Context, hash tmbytes.HexBytes) (evidence ex
 // IterateEvidence provides an interator over all stored Evidence objects. For
 // each Evidence object, cb will be called. If the cb returns true, the iterator
 // will close and stop.
-func (k Keeper) IterateEvidence(ctx sdk.Context, cb func(exported.Evidence) bool) {
+func (k Keeper) IterateEvidence(ctx sdk.Context, cb func(exported.EvidenceI) bool) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixEvidence)
 	iterator := sdk.KVStorePrefixIterator(store, nil)
 
 	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
-		var evidence exported.Evidence
+		var evidence exported.EvidenceI
 		k.cdc.MustUnmarshalBinaryLengthPrefixed(iterator.Value(), &evidence)
 
 		if cb(evidence) {
@@ -147,8 +147,8 @@ func (k Keeper) IterateEvidence(ctx sdk.Context, cb func(exported.Evidence) bool
 }
 
 // GetAllEvidence returns all stored Evidence objects.
-func (k Keeper) GetAllEvidence(ctx sdk.Context) (evidence []exported.Evidence) {
-	k.IterateEvidence(ctx, func(e exported.Evidence) bool {
+func (k Keeper) GetAllEvidence(ctx sdk.Context) (evidence []exported.EvidenceI) {
+	k.IterateEvidence(ctx, func(e exported.EvidenceI) bool {
 		evidence = append(evidence, e)
 		return false
 	})

x/evidence/internal/keeper/keeper_test.go

@@ -67,7 +67,7 @@ func (suite *KeeperTestSuite) SetupTest() {
 
 	// recreate keeper in order to use custom testing types
 	evidenceKeeper := evidence.NewKeeper(
-		cdc, app.GetKey(evidence.StoreKey), app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper,
+		types.ModuleCdc, app.GetKey(evidence.StoreKey), app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper,
 	)
 	router := evidence.NewRouter()
 	router = router.AddRoute(types.TestEvidenceRouteEquivocation, types.TestEquivocationHandler(*evidenceKeeper))
@@ -84,8 +84,8 @@ func (suite *KeeperTestSuite) SetupTest() {
 	}
 }
 
-func (suite *KeeperTestSuite) populateEvidence(ctx sdk.Context, numEvidence int) []exported.Evidence {
-	evidence := make([]exported.Evidence, numEvidence)
+func (suite *KeeperTestSuite) populateEvidence(ctx sdk.Context, numEvidence int) []exported.EvidenceI {
+	evidence := make([]exported.EvidenceI, numEvidence)
 
 	for i := 0; i < numEvidence; i++ {
 		pk := ed25519.GenPrivKey()

x/evidence/internal/keeper/querier.go

@@ -87,7 +87,7 @@ func queryAllEvidence(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte,
 
 	start, end := client.Paginate(len(evidence), params.Page, params.Limit, 100)
 	if start < 0 || end < 0 {
-		evidence = []exported.Evidence{}
+		evidence = []exported.EvidenceI{}
 	} else {
 		evidence = evidence[start:end]
 	}

x/evidence/internal/keeper/querier_test.go

@@ -27,7 +27,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence_Existing() {
 	suite.Nil(err)
 	suite.NotNil(bz)
 
-	var e exported.Evidence
+	var e exported.EvidenceI
 	suite.Nil(types.TestingCdc.UnmarshalJSON(bz, &e))
 	suite.Equal(evidence[0], e)
 }
@@ -61,7 +61,7 @@ func (suite *KeeperTestSuite) TestQueryAllEvidence() {
 	suite.Nil(err)
 	suite.NotNil(bz)
 
-	var e []exported.Evidence
+	var e []exported.EvidenceI
 	suite.Nil(types.TestingCdc.UnmarshalJSON(bz, &e))
 	suite.Len(e, numEvidence)
 }
@@ -80,7 +80,7 @@ func (suite *KeeperTestSuite) TestQueryAllEvidence_InvalidPagination() {
 	suite.Nil(err)
 	suite.NotNil(bz)
 
-	var e []exported.Evidence
+	var e []exported.EvidenceI
 	suite.Nil(types.TestingCdc.UnmarshalJSON(bz, &e))
 	suite.Len(e, 0)
 }

x/evidence/internal/types/codec.go

@@ -5,14 +5,35 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/evidence/exported"
 )
 
+// EvidenceCodec defines the interface required to serialize evidence
+type EvidenceCodec interface {
+	codec.Marshaler
+	MarshalEvidence(acc exported.EvidenceI) ([]byte, error)
+	UnmarshalEvidence(bz []byte) (exported.EvidenceI, error)
+	MarshalEvidenceJSON(acc exported.EvidenceI) ([]byte, error)
+	UnmarshalEvidenceJSON(bz []byte) (exported.EvidenceI, error)
+}
+
+type Codec struct {
+	codec.Marshaler
+
+	// Keep reference to the amino codec to allow backwards compatibility along
+	// with type, and interface registration.
+	amino *codec.Codec
+}
+
+func NewCodec(amino *codec.Codec) *Codec {
+	return &Codec{Marshaler: codec.NewHybridCodec(amino), amino: amino}
+}
+
 // ModuleCdc defines the evidence module's codec. The codec is not sealed as to
 // allow other modules to register their concrete Evidence types.
-var ModuleCdc = codec.New()
+var ModuleCdc = NewCodec(codec.New())
 
 // RegisterCodec registers all the necessary types and interfaces for the
 // evidence module.
 func RegisterCodec(cdc *codec.Codec) {
-	cdc.RegisterInterface((*exported.Evidence)(nil), nil)
+	cdc.RegisterInterface((*exported.EvidenceI)(nil), nil)
 	cdc.RegisterConcrete(MsgSubmitEvidence{}, "cosmos-sdk/MsgSubmitEvidence", nil)
 	cdc.RegisterConcrete(Equivocation{}, "cosmos-sdk/Equivocation", nil)
 }
@@ -21,9 +42,39 @@ func RegisterCodec(cdc *codec.Codec) {
 // in another module for the internal ModuleCdc. This allows the MsgSubmitEvidence
 // to be correctly Amino encoded and decoded.
 func RegisterEvidenceTypeCodec(o interface{}, name string) {
-	ModuleCdc.RegisterConcrete(o, name, nil)
+	ModuleCdc.amino.RegisterConcrete(o, name, nil)
 }
 
 func init() {
-	RegisterCodec(ModuleCdc)
+	RegisterCodec(ModuleCdc.amino)
+}
+
+// MarshalEvidence marshals an EvidenceI interface.
+func (c *Codec) MarshalEvidence(eviI exported.EvidenceI) ([]byte, error) {
+	evi := &Evidence{}
+	evi.SetEvidenceI(eviI)
+	return c.MarshalBinaryLengthPrefixed(evi)
+}
+
+// UnmarshalEvidence returnes an EvidenceI interface.
+func (c *Codec) UnmarshalEvidence(bz []byte) (exported.EvidenceI, error) {
+	evi := &Evidence{}
+	if err := c.UnmarshalBinaryLengthPrefixed(bz, evi); err != nil {
+		return nil, err
+	}
+	return evi.GetEvidenceI(), nil
+}
+
+// MarshalEvidenceJSON JSON encodes an evidence object implementating the EvidenceI interface
+func (c *Codec) MarshalEvidenceJSON(evi exported.EvidenceI) ([]byte, error) {
+	return c.MarshalJSON(evi)
+}
+
+// UnmarshalEvidenceJSON returns an EvidenceI from JSON encoded bytes
+func (c *Codec) UnmarshalEvidenceJSON(bz []byte) (exported.EvidenceI, error) {
+	evi := &Evidence{}
+	if err := c.UnmarshalJSON(bz, evi); err != nil {
+		return nil, err
+	}
+	return evi.GetEvidenceI(), nil
 }

x/evidence/internal/types/codec_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/evidence/internal/types"
 )
 
-var _ exported.Evidence = (*testEvidence)(nil)
+var _ exported.EvidenceI = (*testEvidence)(nil)
 
 type testEvidence struct{}
 
@@ -31,7 +31,7 @@ func TestCodec(t *testing.T) {
 	types.RegisterCodec(cdc)
 	types.RegisterEvidenceTypeCodec(testEvidence{}, "cosmos-sdk/testEvidence")
 
-	var e exported.Evidence = testEvidence{}
+	var e exported.EvidenceI = testEvidence{}
 	bz, err := cdc.MarshalBinaryBare(e)
 	require.NoError(t, err)
 

x/evidence/internal/types/evidence.go

@@ -19,16 +19,7 @@ const (
 	TypeEquivocation  = "equivocation"
 )
 
-var _ exported.Evidence = (*Equivocation)(nil)
-
-// Equivocation implements the Evidence interface and defines evidence of double
-// signing misbehavior.
-type Equivocation struct {
-	Height           int64           `json:"height" yaml:"height"`
-	Time             time.Time       `json:"time" yaml:"time"`
-	Power            int64           `json:"power" yaml:"power"`
-	ConsensusAddress sdk.ConsAddress `json:"consensus_address" yaml:"consensus_address"`
-}
+var _ exported.EvidenceI = (*Equivocation)(nil)
 
 // Route returns the Evidence Handler route for an Equivocation type.
 func (e Equivocation) Route() string { return RouteEquivocation }
@@ -43,7 +34,7 @@ func (e Equivocation) String() string {
 
 // Hash returns the hash of an Equivocation object.
 func (e Equivocation) Hash() tmbytes.HexBytes {
-	return tmhash.Sum(ModuleCdc.MustMarshalBinaryBare(e))
+	return tmhash.Sum(ModuleCdc.MustMarshalBinaryBare(&e))
 }
 
 // ValidateBasic performs basic stateless validation checks on an Equivocation object.
@@ -57,7 +48,8 @@ func (e Equivocation) ValidateBasic() error {
 	if e.Power < 1 {
 		return fmt.Errorf("invalid equivocation validator power: %d", e.Power)
 	}
-	if e.ConsensusAddress.Empty() {
+	consaddr := sdk.ConsAddress(e.ConsensusAddress)
+	if consaddr.Empty() {
 		return fmt.Errorf("invalid equivocation validator consensus address: %s", e.ConsensusAddress)
 	}
 
@@ -91,7 +83,7 @@ func (e Equivocation) GetTotalPower() int64 { return 0 }
 
 // ConvertDuplicateVoteEvidence converts a Tendermint concrete Evidence type to
 // SDK Evidence using Equivocation as the concrete type.
-func ConvertDuplicateVoteEvidence(dupVote abci.Evidence) exported.Evidence {
+func ConvertDuplicateVoteEvidence(dupVote abci.Evidence) exported.EvidenceI {
 	return Equivocation{
 		Height:           dupVote.Height,
 		Power:            dupVote.Validator.Power,