Linting

client/context/context.go

@@ -169,10 +169,6 @@ func (ctx CLIContext) WithMarshaler(m codec.Marshaler) CLIContext {
 // TODO: Deprecated (remove).
 func (ctx CLIContext) WithCodec(cdc *codec.Codec) CLIContext {
 	ctx.Codec = cdc
-	// Marshaler is set here for backwards compatibility with amino-only code
-	if ctx.Marshaler == nil {
-		ctx.Marshaler = codec.NewAminoCodec(cdc)
-	}
 	return ctx
 }
 

codec/amino.go

@@ -25,7 +25,8 @@ func init() {
 	Cdc = cdc.Seal()
 }
 
-// Codec defines a type alias for an Amino codec.
+// Codec defines a wrapper for an Amino codec that properly handles protobuf
+// types with Any's
 type Codec struct {
 	Amino *amino.Codec
 }

codec/amino_codec.go

@@ -9,7 +9,7 @@ type AminoCodec struct {
 var _ Marshaler = &AminoCodec{}
 
 func NewAminoCodec(Codec *Codec) *AminoCodec {
-	return &AminoCodec{Codec}
+	return &AminoCodec{Codec: Codec}
 }
 
 func (ac *AminoCodec) MarshalBinaryBare(o ProtoMarshaler) ([]byte, error) {

types/result.go

@@ -7,11 +7,10 @@ import (
 	"math"
 	"strings"
 
-	"github.com/cosmos/cosmos-sdk/codec/types"
-
 	yaml "gopkg.in/yaml.v2"
 
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/types"
 
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )

x/auth/client/cli/broadcast_test.go

@@ -5,12 +5,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/cosmos/cosmos-sdk/codec"
-
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/tests"
 )
 

x/bank/keeper/invariants.go

@@ -49,7 +49,7 @@ func NonnegativeBalanceInvariant(k ViewKeeper) sdk.Invariant {
 // TotalSupply checks that the total supply reflects all the coins held in accounts
 func TotalSupply(k Keeper) sdk.Invariant {
 	return func(ctx sdk.Context) (string, bool) {
-		var expectedTotal sdk.Coins = []sdk.Coin{}
+		expectedTotal := []sdk.Coin{}
 		supply := k.GetSupply(ctx)
 
 		k.IterateAllBalances(ctx, func(_ sdk.AccAddress, balance sdk.Coin) bool {

x/gov/types/codec.go

@@ -30,7 +30,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 }
 
 // RegisterProposalTypeCodec registers an external proposal content type defined
-// in another module for the internal ModuleCdc. This allows the MsgSubmitProposalLegacy
+// in another module for the internal ModuleCdc. This allows the MsgSubmitProposal
 // to be correctly Amino encoded and decoded.
 //
 // NOTE: This should only be used for applications that are still using a concrete

x/gov/types/genesis.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/cosmos/cosmos-sdk/codec/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 

x/gov/types/msgs.go

@@ -24,7 +24,7 @@ var _ MsgSubmitProposalI = &MsgSubmitProposal{}
 var _ types.UnpackInterfacesMessage = MsgSubmitProposal{}
 
 // MsgSubmitProposalI defines the specific interface a concrete message must
-// implement in order to process governance proposals. The concrete MsgSubmitProposalLegacy
+// implement in order to process governance proposals. The concrete MsgSubmitProposal
 // must be defined at the application-level.
 type MsgSubmitProposalI interface {
 	sdk.Msg