Update x/auth to use Any

client/keys/parse.go

@@ -12,9 +12,10 @@ import (
 	"github.com/spf13/viper"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/cosmos/cosmos-sdk/types/bech32"
 	"github.com/tendermint/tendermint/libs/cli"
 
+	"github.com/cosmos/cosmos-sdk/types/bech32"
+
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

simapp/app.go

@@ -367,7 +367,7 @@ func NewSimApp(
 func MakeCodecs() (*std.Codec, *codec.Codec) {
 	cdc := std.MakeCodec(ModuleBasics)
 	interfaceRegistry := types.NewInterfaceRegistry()
-	sdk.RegisterInterfaces(interfaceRegistry)
+	std.RegisterInterfaces(interfaceRegistry)
 	ModuleBasics.RegisterInterfaceModules(interfaceRegistry)
 	appCodec := std.NewAppCodec(cdc, interfaceRegistry)
 	return appCodec, cdc

simapp/cmd/simd/genaccounts.go

@@ -19,7 +19,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
+	"github.com/cosmos/cosmos-sdk/x/auth/types"
 	authvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
@@ -85,7 +85,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
 			}
 
 			// create concrete account type based on input parameters
-			var genAccount authexported.GenesisAccount
+			var genAccount types.GenesisAccount
 
 			balances := bank.Balance{Address: addr, Coins: coins.Sort()}
 			baseAccount := auth.NewBaseAccount(addr, nil, 0, 0)

simapp/genesis_account.go

@@ -5,11 +5,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
-var _ authexported.GenesisAccount = (*SimGenesisAccount)(nil)
+var _ authtypes.GenesisAccount = (*SimGenesisAccount)(nil)
 
 // SimGenesisAccount defines a type that implements the GenesisAccount interface
 // to be used for simulation accounts in the genesis state.

simapp/test_helpers.go

@@ -20,7 +20,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 )
 
@@ -70,7 +69,7 @@ func Setup(isCheckTx bool) *SimApp {
 
 // SetupWithGenesisAccounts initializes a new SimApp with the provided genesis
 // accounts and possible balances.
-func SetupWithGenesisAccounts(genAccs []authexported.GenesisAccount, balances ...bank.Balance) *SimApp {
+func SetupWithGenesisAccounts(genAccs []auth.GenesisAccount, balances ...bank.Balance) *SimApp {
 	db := dbm.NewMemDB()
 	app := NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0)
 

std/codec.go

@@ -5,15 +5,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	"github.com/cosmos/cosmos-sdk/x/auth"
-	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
 )
 
-var (
-	_ auth.Codec = (*Codec)(nil)
-)
-
 // Codec defines the application-level codec. This codec contains all the
 // required module-specific codecs that are to be provided upon initialization.
 type Codec struct {
@@ -30,45 +24,6 @@ func NewAppCodec(amino *codec.Codec, anyUnpacker types.AnyUnpacker) *Codec {
 	return &Codec{Marshaler: codec.NewHybridCodec(amino, anyUnpacker), amino: amino, anyUnpacker: anyUnpacker}
 }
 
-// MarshalAccount marshals an Account interface. If the given type implements
-// the Marshaler interface, it is treated as a Proto-defined message and
-// serialized that way. Otherwise, it falls back on the internal Amino codec.
-func (c *Codec) MarshalAccount(accI authexported.Account) ([]byte, error) {
-	acc := &Account{}
-	if err := acc.SetAccount(accI); err != nil {
-		return nil, err
-	}
-
-	return c.Marshaler.MarshalBinaryBare(acc)
-}
-
-// UnmarshalAccount returns an Account interface from raw encoded account bytes
-// of a Proto-based Account type. An error is returned upon decoding failure.
-func (c *Codec) UnmarshalAccount(bz []byte) (authexported.Account, error) {
-	acc := &Account{}
-	if err := c.Marshaler.UnmarshalBinaryBare(bz, acc); err != nil {
-		return nil, err
-	}
-
-	return acc.GetAccount(), nil
-}
-
-// MarshalAccountJSON JSON encodes an account object implementing the Account
-// interface.
-func (c *Codec) MarshalAccountJSON(acc authexported.Account) ([]byte, error) {
-	return c.Marshaler.MarshalJSON(acc)
-}
-
-// UnmarshalAccountJSON returns an Account from JSON encoded bytes.
-func (c *Codec) UnmarshalAccountJSON(bz []byte) (authexported.Account, error) {
-	acc := &Account{}
-	if err := c.Marshaler.UnmarshalJSON(bz, acc); err != nil {
-		return nil, err
-	}
-
-	return acc.GetAccount(), nil
-}
-
 // ----------------------------------------------------------------------------
 // necessary types and interfaces registered. This codec is provided to all the
 // modules the application depends on.
@@ -85,3 +40,9 @@ func MakeCodec(bm module.BasicManager) *codec.Codec {
 
 	return cdc
 }
+
+// RegisterInterfaces registers Interfaces from sdk/types and vesting
+func RegisterInterfaces(interfaceRegistry types.InterfaceRegistry) {
+	sdk.RegisterInterfaces(interfaceRegistry)
+	vesting.RegisterInterfaces(interfaceRegistry)
+}