Make AminoCodec implement Marshaler and some godoc fixes

codec/amino.go

@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/types"
 )
 
-// deprecated: Codec defines a wrapper for an Amino codec that properly handles protobuf
+// deprecated: LegacyAmino defines a wrapper for an Amino codec that properly handles protobuf
 // types with Any's
 type LegacyAmino struct {
 	Amino *amino.Codec

codec/amino_codec.go

@@ -1,12 +1,14 @@
 package codec
 
+import "github.com/gogo/protobuf/proto"
+
 // AminoCodec defines a codec that utilizes Codec for both binary and JSON
 // encoding.
 type AminoCodec struct {
 	*LegacyAmino
 }
 
-var _ BinaryMarshaler = &AminoCodec{}
+var _ Marshaler = &AminoCodec{}
 
 func NewAminoCodec(codec *LegacyAmino) *AminoCodec {
 	return &AminoCodec{LegacyAmino: codec}
@@ -43,3 +45,19 @@ func (ac *AminoCodec) UnmarshalBinaryLengthPrefixed(bz []byte, ptr ProtoMarshale
 func (ac *AminoCodec) MustUnmarshalBinaryLengthPrefixed(bz []byte, ptr ProtoMarshaler) {
 	ac.LegacyAmino.MustUnmarshalBinaryLengthPrefixed(bz, ptr)
 }
+
+func (ac *AminoCodec) MarshalJSON(o proto.Message) ([]byte, error) {
+	return ac.LegacyAmino.MarshalJSON(o)
+}
+
+func (ac *AminoCodec) MustMarshalJSON(o proto.Message) []byte {
+	return ac.LegacyAmino.MustMarshalJSON(o)
+}
+
+func (ac *AminoCodec) UnmarshalJSON(bz []byte, ptr proto.Message) error {
+	return ac.LegacyAmino.UnmarshalJSON(bz, ptr)
+}
+
+func (ac *AminoCodec) MustUnmarshalJSON(bz []byte, ptr proto.Message) {
+	ac.LegacyAmino.MustUnmarshalJSON(bz, ptr)
+}

simapp/app.go

@@ -445,7 +445,7 @@ func (app *SimApp) BlockedAddrs() map[string]bool {
 	return blockedAddrs
 }
 
-// Codec returns SimApp's codec.
+// LegacyAmino returns SimApp's legacy amino codec.
 //
 // NOTE: This is solely to be used for testing purposes as it may be desirable
 // for modules to register their own custom testing types.

simapp/state.go

@@ -105,6 +105,7 @@ func AppStateRandomizedFn(
 	simState := &module.SimulationState{
 		AppParams:    appParams,
 		Cdc:          cdc,
+		LegacyAmino:  legacyAmino,
 		Rand:         r,
 		GenState:     genesisState,
 		Accounts:     accs,

x/auth/keeper/querier_test.go

@@ -39,13 +39,13 @@ func TestQueryAccount(t *testing.T) {
 	require.Error(t, err)
 	require.Nil(t, res)
 
-	req.Data = legacyQuerierCdc.MustMarshalJSON(types.QueryAccountRequest{Address: []byte("")})
+	req.Data = legacyQuerierCdc.MustMarshalJSON(&types.QueryAccountRequest{Address: []byte("")})
 	res, err = querier(ctx, path, req)
 	require.Error(t, err)
 	require.Nil(t, res)
 
 	_, _, addr := testdata.KeyTestPubAddr()
-	req.Data = legacyQuerierCdc.MustMarshalJSON(types.QueryAccountRequest{Address: addr})
+	req.Data = legacyQuerierCdc.MustMarshalJSON(&types.QueryAccountRequest{Address: addr})
 	res, err = querier(ctx, path, req)
 	require.Error(t, err)
 	require.Nil(t, res)
@@ -60,6 +60,6 @@ func TestQueryAccount(t *testing.T) {
 	require.NotNil(t, res)
 
 	var account types.AccountI
-	err2 := legacyQuerierCdc.UnmarshalJSON(res, &account)
+	err2 := legacyQuerierCdc.LegacyAmino.UnmarshalJSON(res, &account)
 	require.Nil(t, err2)
 }

x/bank/simulation/params.go

@@ -18,7 +18,7 @@ func ParamChanges(r *rand.Rand) []simtypes.ParamChange {
 	return []simtypes.ParamChange{
 		simulation.NewSimParamChange(types.ModuleName, string(types.KeySendEnabled),
 			func(r *rand.Rand) string {
-				return fmt.Sprintf("%s", types.ModuleCdc.MustMarshalJSON(RandomGenesisSendParams(r)))
+				return fmt.Sprintf("%s", types.ModuleCdc.LegacyAmino.MustMarshalJSON(RandomGenesisSendParams(r)))
 			},
 		),
 		simulation.NewSimParamChange(types.ModuleName, string(types.KeyDefaultSendEnabled),