Update vesting types

x/auth/alias.go

@@ -61,6 +61,7 @@ var (
 	MakeSignature                     = types.MakeSignature
 	ValidateGenAccounts               = types.ValidateGenAccounts
 	GetGenesisStateFromAppState       = types.GetGenesisStateFromAppState
+	NewCodec                          = types.NewCodec
 
 	// variable aliases
 	ModuleCdc                 = types.ModuleCdc
@@ -89,4 +90,6 @@ type (
 	StdSignature                     = types.StdSignature
 	TxBuilder                        = types.TxBuilder
 	GenesisAccountIterator           = types.GenesisAccountIterator
+	AuthCodec                        = types.AuthCodec
+	Codec                            = types.Codec
 )

x/auth/vesting/alias.go

@@ -1,9 +1,7 @@
-// nolint
-// autogenerated code using github.com/rigelrozanski/multitool
-// aliases generated for the following subdirectories:
-// ALIASGEN: github.com/cosmos/cosmos-sdk/x/auth/vesting/types/
 package vesting
 
+// nolint
+
 import (
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 )
@@ -18,6 +16,7 @@ var (
 	NewPeriodicVestingAccount      = types.NewPeriodicVestingAccount
 	NewDelayedVestingAccountRaw    = types.NewDelayedVestingAccountRaw
 	NewDelayedVestingAccount       = types.NewDelayedVestingAccount
+	NewCodec                       = types.NewCodec
 
 	// variable aliases
 	VestingCdc = types.VestingCdc
@@ -30,4 +29,5 @@ type (
 	DelayedVestingAccount    = types.DelayedVestingAccount
 	Period                   = types.Period
 	Periods                  = types.Periods
+	Codec                    = types.Codec
 )

x/auth/vesting/exported/exported.go

@@ -9,7 +9,7 @@ import (
 
 // VestingAccount defines an account type that vests coins via a vesting schedule.
 type VestingAccount interface {
-	authexported.Account
+	authexported.AccountI
 
 	// LockedCoins returns the set of coins that are not spendable (i.e. locked).
 	//

x/auth/vesting/types/codec.go

@@ -2,9 +2,68 @@ package types
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting/exported"
 )
 
+var _ authtypes.AuthCodec = (*Codec)(nil)
+
+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}
+}
+
+// MarshalAccount marshals an AccountI 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.AccountI) ([]byte, error) {
+	acc := &VestingAccount{}
+	acc.SetAccountI(accI)
+	return c.Marshaler.MarshalBinaryLengthPrefixed(acc)
+}
+
+// UnmarshalAccount returns an AccountI 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.AccountI, error) {
+	acc := &VestingAccount{}
+	if err := c.Marshaler.UnmarshalBinaryLengthPrefixed(bz, acc); err != nil {
+		return nil, err
+	}
+	return acc.GetAccountI(), nil
+}
+
+// MarshalAccountJSON JSON encodes an account object implementing the AccountI
+// interface.
+func (c *Codec) MarshalAccountJSON(acc authexported.AccountI) ([]byte, error) {
+	return c.Marshaler.MarshalJSON(acc)
+}
+
+// UnmarshalAccountJSON returns an AccountI from JSON encoded bytes.
+func (c *Codec) UnmarshalAccountJSON(bz []byte) (authexported.AccountI, error) {
+	acc := &VestingAccount{}
+	if err := c.Marshaler.UnmarshalJSON(bz, acc); err != nil {
+		return nil, err
+	}
+
+	return acc.GetAccountI(), nil
+}
+
+// ----------------------------------------------------------------------------
+
+// VestingCdc is the global vesting-specific codec for x/auth module.
+//
+// NOTE: This codec is deprecated, where a codec via NewCodec without an Amino
+// codec should be used.
+var VestingCdc = NewCodec(codec.New())
+
 // RegisterCodec registers concrete types on the codec
 func RegisterCodec(cdc *codec.Codec) {
 	cdc.RegisterInterface((*exported.VestingAccount)(nil), nil)
@@ -14,11 +73,8 @@ func RegisterCodec(cdc *codec.Codec) {
 	cdc.RegisterConcrete(&PeriodicVestingAccount{}, "cosmos-sdk/PeriodicVestingAccount", nil)
 }
 
-// VestingCdc module wide codec
-var VestingCdc *codec.Codec
-
 func init() {
-	VestingCdc = codec.New()
-	RegisterCodec(VestingCdc)
-	VestingCdc.Seal()
+	RegisterCodec(VestingCdc.amino)
+	codec.RegisterCrypto(VestingCdc.amino)
+	VestingCdc.amino.Seal()
 }

x/auth/vesting/types/genesis_test.go

@@ -22,7 +22,7 @@ var (
 func TestValidateGenesisInvalidAccounts(t *testing.T) {
 	acc1 := authtypes.NewBaseAccountWithAddress(sdk.AccAddress(addr1))
 	acc1Balance := sdk.NewCoins(sdk.NewInt64Coin(sdk.DefaultBondDenom, 150))
-	baseVestingAcc := NewBaseVestingAccount(&acc1, acc1Balance, 1548775410)
+	baseVestingAcc := NewBaseVestingAccount(acc1, acc1Balance, 1548775410)
 
 	// invalid delegated vesting
 	baseVestingAcc.DelegatedVesting = acc1Balance.Add(acc1Balance...)
@@ -32,7 +32,7 @@ func TestValidateGenesisInvalidAccounts(t *testing.T) {
 
 	genAccs := make([]exported.GenesisAccount, 2)
 	genAccs[0] = baseVestingAcc
-	genAccs[1] = &acc2
+	genAccs[1] = acc2
 
 	require.Error(t, authtypes.ValidateGenAccounts(genAccs))
 	baseVestingAcc.DelegatedVesting = acc1Balance

x/auth/vesting/types/period.go

@@ -4,22 +4,16 @@ import (
 	"fmt"
 	"strings"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	"gopkg.in/yaml.v2"
 )
 
-// Period defines a length of time and amount of coins that will vest
-type Period struct {
-	Length int64     `json:"length" yaml:"length"` // length of the period, in seconds
-	Amount sdk.Coins `json:"amount" yaml:"amount"` // amount of coins vesting during this period
-}
-
 // Periods stores all vesting periods passed as part of a PeriodicVestingAccount
 type Periods []Period
 
 // String Period implements stringer interface
 func (p Period) String() string {
-	return fmt.Sprintf(`Length: %d
-	Amount: %s`, p.Length, p.Amount)
+	out, _ := yaml.Marshal(p)
+	return string(out)
 }
 
 // String Periods implements stringer interface
@@ -28,6 +22,7 @@ func (vp Periods) String() string {
 	for _, period := range vp {
 		periodsListString = append(periodsListString, period.String())
 	}
+
 	return strings.TrimSpace(fmt.Sprintf(`Vesting Periods:
 		%s`, strings.Join(periodsListString, ", ")))
 }