Start removing HybridCodec (init + auth, bank, distribution)

codec/any.go

@@ -10,7 +10,7 @@ import (
 
 // MarshalAny is a convenience function for packing the provided value in an
 // Any and then proto marshaling it to bytes
-func MarshalAny(m Marshaler, x interface{}) ([]byte, error) {
+func MarshalAny(m BinaryMarshaler, x interface{}) ([]byte, error) {
 	msg, ok := x.(proto.Message)
 	if !ok {
 		return nil, fmt.Errorf("can't proto marshal %T", x)
@@ -32,7 +32,7 @@ func MarshalAny(m Marshaler, x interface{}) ([]byte, error) {
 // Ex:
 //		var x MyInterface
 //		err := UnmarshalAny(unpacker, &x, bz)
-func UnmarshalAny(m Marshaler, iface interface{}, bz []byte) error {
+func UnmarshalAny(m BinaryMarshaler, iface interface{}, bz []byte) error {
 	any := &types.Any{}
 
 	err := m.UnmarshalBinaryBare(bz, any)

codec/codec.go

@@ -17,9 +17,12 @@ type (
 	//
 	// 1. AminoCodec: Provides full Amino serialization compatibility.
 	// 2. ProtoCodec: Provides full Protobuf serialization compatibility.
-	// 3. HybridCodec: Provides Protobuf serialization for binary encoding and Amino
-	// for JSON encoding.
 	Marshaler interface {
+		BinaryMarshaler
+		JSONMarshaler
+	}
+
+	BinaryMarshaler interface {
 		MarshalBinaryBare(o ProtoMarshaler) ([]byte, error)
 		MustMarshalBinaryBare(o ProtoMarshaler) []byte
 
@@ -32,7 +35,6 @@ type (
 		UnmarshalBinaryLengthPrefixed(bz []byte, ptr ProtoMarshaler) error
 		MustUnmarshalBinaryLengthPrefixed(bz []byte, ptr ProtoMarshaler)
 
-		JSONMarshaler
 		types.AnyUnpacker
 	}
 

simapp/app.go

@@ -328,7 +328,7 @@ func NewSimApp(
 	)
 
 	app.mm.RegisterInvariants(&app.CrisisKeeper)
-	app.mm.RegisterRoutes(app.Router(), app.QueryRouter())
+	app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), codec.NewAminoCodec(encodingConfig.Amino))
 	app.mm.RegisterQueryServices(app.GRPCQueryRouter())
 
 	// add test gRPC service for testing gRPC queries in isolation

types/module/module.go

@@ -160,7 +160,7 @@ type AppModule interface {
 	// Deprecated: use RegisterQueryService
 	QuerierRoute() string
 	// Deprecated: use RegisterQueryService
-	NewQuerierHandler() sdk.Querier
+	LegacyQuerierHandler(codec.JSONMarshaler) sdk.Querier
 	// RegisterQueryService allows a module to register a gRPC query service
 	RegisterQueryService(grpc.Server)
 
@@ -192,8 +192,8 @@ func (GenesisOnlyAppModule) Route() sdk.Route { return sdk.Route{} }
 // QuerierRoute returns an empty module querier route
 func (GenesisOnlyAppModule) QuerierRoute() string { return "" }
 
-// NewQuerierHandler returns an empty module querier
-func (gam GenesisOnlyAppModule) NewQuerierHandler() sdk.Querier { return nil }
+// LegacyQuerierHandler returns an empty module querier
+func (gam GenesisOnlyAppModule) LegacyQuerierHandler(codec.JSONMarshaler) sdk.Querier { return nil }
 
 func (gam GenesisOnlyAppModule) RegisterQueryService(grpc.Server) {}
 
@@ -264,13 +264,13 @@ func (m *Manager) RegisterInvariants(ir sdk.InvariantRegistry) {
 }
 
 // RegisterRoutes registers all module routes and module querier routes
-func (m *Manager) RegisterRoutes(router sdk.Router, queryRouter sdk.QueryRouter) {
+func (m *Manager) RegisterRoutes(router sdk.Router, queryRouter sdk.QueryRouter, legacyQuerierCdc codec.JSONMarshaler) {
 	for _, module := range m.Modules {
 		if !module.Route().Empty() {
 			router.AddRoute(module.Route())
 		}
 		if module.QuerierRoute() != "" {
-			queryRouter.AddRoute(module.QuerierRoute(), module.NewQuerierHandler())
+			queryRouter.AddRoute(module.QuerierRoute(), module.LegacyQuerierHandler(legacyQuerierCdc))
 		}
 	}
 }

types/module/module_test.go

@@ -76,7 +76,7 @@ func TestGenesisOnlyAppModule(t *testing.T) {
 
 	require.True(t, goam.Route().Empty())
 	require.Empty(t, goam.QuerierRoute())
-	require.Nil(t, goam.NewQuerierHandler())
+	require.Nil(t, goam.LegacyQuerierHandler(nil))
 
 	// no-op
 	goam.RegisterInvariants(mockInvariantRegistry)
@@ -163,7 +163,9 @@ func TestManager_RegisterRoutes(t *testing.T) {
 	mockAppModule1.EXPECT().NewQuerierHandler().Times(1).Return(handler3)
 	queryRouter.EXPECT().AddRoute(gomock.Eq("querierRoute1"), gomock.Eq(handler3)).Times(1)
 
-	mm.RegisterRoutes(router, queryRouter)
+	amino := codec.New()
+	jsonCdc := codec.NewAminoCodec(amino)
+	mm.RegisterRoutes(router, queryRouter, jsonCdc)
 }
 
 func TestManager_RegisterQueryServices(t *testing.T) {

x/auth/keeper/keeper.go

@@ -8,7 +8,6 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -19,7 +18,7 @@ import (
 // encoding/decoding library.
 type AccountKeeper struct {
 	key           sdk.StoreKey
-	cdc           codec.Marshaler
+	cdc           codec.BinaryMarshaler
 	paramSubspace paramtypes.Subspace
 	permAddrs     map[string]types.PermissionsForAddress
 
@@ -30,7 +29,7 @@ type AccountKeeper struct {
 // NewAccountKeeper returns a new sdk.AccountKeeper that uses go-amino to
 // (binary) encode and decode concrete sdk.Accounts.
 func NewAccountKeeper(
-	cdc codec.Marshaler, key sdk.StoreKey, paramstore paramtypes.Subspace, proto func() types.AccountI,
+	cdc codec.BinaryMarshaler, key sdk.StoreKey, paramstore paramtypes.Subspace, proto func() types.AccountI,
 	maccPerms map[string][]string,
 ) AccountKeeper {
 
@@ -203,19 +202,4 @@ func (ak AccountKeeper) UnmarshalAccount(bz []byte) (types.AccountI, error) {
 	return acc, nil
 }
 
-// UnmarshalAccountJSON returns an AccountI from JSON encoded bytes
-func (ak AccountKeeper) UnmarshalAccountJSON(bz []byte) (types.AccountI, error) {
-	var any codectypes.Any
-	if err := ak.cdc.UnmarshalJSON(bz, &any); err != nil {
-		return nil, err
-	}
-
-	var acc types.AccountI
-	if err := ak.cdc.UnpackAny(&any, &acc); err != nil {
-		return nil, err
-	}
-
-	return acc, nil
-}
-
-func (ak AccountKeeper) GetCodec() codec.Marshaler { return ak.cdc }
+func (ak AccountKeeper) GetCodec() codec.BinaryMarshaler { return ak.cdc }

x/auth/keeper/querier.go

@@ -10,24 +10,24 @@ import (
 )
 
 // NewQuerier creates a querier for auth REST endpoints
-func NewQuerier(k AccountKeeper) sdk.Querier {
+func NewQuerier(k AccountKeeper, cdc codec.JSONMarshaler) sdk.Querier {
 	return func(ctx sdk.Context, path []string, req abci.RequestQuery) ([]byte, error) {
 		switch path[0] {
 		case types.QueryAccount:
-			return queryAccount(ctx, req, k)
+			return queryAccount(ctx, req, k, cdc)
 
 		case types.QueryParams:
-			return queryParams(ctx, k)
+			return queryParams(ctx, k, cdc)
 
 		default:
 			return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown query path: %s", path[0])
 		}
 	}
 }
 
-func queryAccount(ctx sdk.Context, req abci.RequestQuery, k AccountKeeper) ([]byte, error) {
+func queryAccount(ctx sdk.Context, req abci.RequestQuery, k AccountKeeper, cdc codec.JSONMarshaler) ([]byte, error) {
 	var params types.QueryAccountRequest
-	if err := k.cdc.UnmarshalJSON(req.Data, &params); err != nil {
+	if err := cdc.UnmarshalJSON(req.Data, &params); err != nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
 	}
 
@@ -36,18 +36,18 @@ func queryAccount(ctx sdk.Context, req abci.RequestQuery, k AccountKeeper) ([]by
 		return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "account %s does not exist", params.Address)
 	}
 
-	bz, err := codec.MarshalJSONIndent(k.cdc, account)
+	bz, err := codec.MarshalJSONIndent(cdc, account)
 	if err != nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
 	}
 
 	return bz, nil
 }
 
-func queryParams(ctx sdk.Context, k AccountKeeper) ([]byte, error) {
+func queryParams(ctx sdk.Context, k AccountKeeper, cdc codec.JSONMarshaler) ([]byte, error) {
 	params := k.GetParams(ctx)
 
-	res, err := codec.MarshalJSONIndent(k.cdc, params)
+	res, err := codec.MarshalJSONIndent(cdc, params)
 	if err != nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
 	}

x/auth/keeper/querier_test.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/cosmos/cosmos-sdk/codec"
+
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -15,15 +17,15 @@ import (
 
 func TestQueryAccount(t *testing.T) {
 	app, ctx := createTestApp(true)
-	cdc := app.Codec()
+	jsonCdc := codec.NewAminoCodec(app.Codec())
 
 	req := abci.RequestQuery{
 		Path: "",
 		Data: []byte{},
 	}
 
 	path := []string{types.QueryAccount}
-	querier := keep.NewQuerier(app.AccountKeeper)
+	querier := keep.NewQuerier(app.AccountKeeper, jsonCdc)
 
 	bz, err := querier(ctx, []string{"other"}, req)
 	require.Error(t, err)
@@ -37,13 +39,13 @@ func TestQueryAccount(t *testing.T) {
 	require.Error(t, err)
 	require.Nil(t, res)
 
-	req.Data = cdc.MustMarshalJSON(types.QueryAccountRequest{Address: []byte("")})
+	req.Data = jsonCdc.MustMarshalJSON(types.QueryAccountRequest{Address: []byte("")})
 	res, err = querier(ctx, path, req)
 	require.Error(t, err)
 	require.Nil(t, res)
 
 	_, _, addr := testdata.KeyTestPubAddr()
-	req.Data = cdc.MustMarshalJSON(types.QueryAccountRequest{Address: addr})
+	req.Data = jsonCdc.MustMarshalJSON(types.QueryAccountRequest{Address: addr})
 	res, err = querier(ctx, path, req)
 	require.Error(t, err)
 	require.Nil(t, res)
@@ -58,6 +60,6 @@ func TestQueryAccount(t *testing.T) {
 	require.NotNil(t, res)
 
 	var account types.AccountI
-	err2 := cdc.UnmarshalJSON(res, &account)
+	err2 := jsonCdc.UnmarshalJSON(res, &account)
 	require.Nil(t, err2)
 }

x/auth/module.go

@@ -112,9 +112,9 @@ func (AppModule) QuerierRoute() string {
 	return types.QuerierRoute
 }
 
-// NewQuerierHandler returns the auth module sdk.Querier.
-func (am AppModule) NewQuerierHandler() sdk.Querier {
-	return keeper.NewQuerier(am.accountKeeper)
+// LegacyQuerierHandler returns the auth module sdk.Querier.
+func (am AppModule) LegacyQuerierHandler(jsonCdc codec.JSONMarshaler) sdk.Querier {
+	return keeper.NewQuerier(am.accountKeeper, jsonCdc)
 }
 
 // RegisterQueryService registers a GRPC query service to respond to the

x/auth/simulation/decoder.go

@@ -13,7 +13,7 @@ import (
 
 type AuthUnmarshaler interface {
 	UnmarshalAccount([]byte) (types.AccountI, error)
-	GetCodec() codec.Marshaler
+	GetCodec() codec.BinaryMarshaler
 }
 
 // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's

x/bank/keeper/keeper.go

@@ -4,10 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gogo/protobuf/proto"
-
 	"github.com/cosmos/cosmos-sdk/codec"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -42,8 +39,6 @@ type Keeper interface {
 	UndelegateCoins(ctx sdk.Context, moduleAccAddr, delegatorAddr sdk.AccAddress, amt sdk.Coins) error
 	MarshalSupply(supplyI exported.SupplyI) ([]byte, error)
 	UnmarshalSupply(bz []byte) (exported.SupplyI, error)
-	MarshalSupplyJSON(supply exported.SupplyI) ([]byte, error)
-	UnmarshalSupplyJSON(bz []byte) (exported.SupplyI, error)
 
 	types.QueryServer
 }
@@ -53,13 +48,13 @@ type BaseKeeper struct {
 	BaseSendKeeper
 
 	ak         types.AccountKeeper
-	cdc        codec.Marshaler
+	cdc        codec.BinaryMarshaler
 	storeKey   sdk.StoreKey
 	paramSpace paramtypes.Subspace
 }
 
 func NewBaseKeeper(
-	cdc codec.Marshaler, storeKey sdk.StoreKey, ak types.AccountKeeper, paramSpace paramtypes.Subspace,
+	cdc codec.BinaryMarshaler, storeKey sdk.StoreKey, ak types.AccountKeeper, paramSpace paramtypes.Subspace,
 	blockedAddrs map[string]bool,
 ) BaseKeeper {
 
@@ -370,34 +365,3 @@ func (k BaseKeeper) UnmarshalSupply(bz []byte) (exported.SupplyI, error) {
 
 	return evi, nil
 }
-
-// MarshalSupplyJSON JSON encodes a supply object implementing the Supply
-// interface.
-func (k BaseKeeper) MarshalSupplyJSON(supply exported.SupplyI) ([]byte, error) {
-	msg, ok := supply.(proto.Message)
-	if !ok {
-		return nil, fmt.Errorf("cannot proto marshal %T", supply)
-	}
-
-	any, err := codectypes.NewAnyWithValue(msg)
-	if err != nil {
-		return nil, err
-	}
-
-	return k.cdc.MarshalJSON(any)
-}
-
-// UnmarshalSupplyJSON returns a Supply from JSON encoded bytes
-func (k BaseKeeper) UnmarshalSupplyJSON(bz []byte) (exported.SupplyI, error) {
-	var any codectypes.Any
-	if err := k.cdc.UnmarshalJSON(bz, &any); err != nil {
-		return nil, err
-	}
-
-	var supply exported.SupplyI
-	if err := k.cdc.UnpackAny(&any, &supply); err != nil {
-		return nil, err
-	}
-
-	return supply, nil
-}