[Bugfix] Convert Custom JSON Marshaling Codec to Amino Codec

x/auth/vesting/types/vesting_account.go

@@ -1,8 +1,6 @@
 package types
 
 import (
-	"encoding/json"
-	"github.com/tendermint/tendermint/crypto"
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -184,63 +182,6 @@ func (lgva LazyGradedVestingAccount) MarshalYAML() (interface{}, error) {
 	return string(bz), err
 }
 
-// MarshalJSON returns the JSON representation of a LazyGradedVestingAccount.
-func (lgva LazyGradedVestingAccount) MarshalJSON() ([]byte, error) {
-	alias := vestingAccountPretty{
-		Address:          lgva.Address,
-		Coins:            lgva.Coins,
-		AccountNumber:    lgva.AccountNumber,
-		Sequence:         lgva.Sequence,
-		OriginalVesting:  lgva.OriginalVesting,
-		DelegatedFree:    lgva.DelegatedFree,
-		DelegatedVesting: lgva.DelegatedVesting,
-		EndTime:          lgva.EndTime,
-	}
-
-	if lgva.PubKey != nil {
-		pks, err := sdk.Bech32ifyPubKey(sdk.Bech32PubKeyTypeAccPub, lgva.GetPubKey())
-		if err != nil {
-			return nil, err
-		}
-
-		alias.PubKey = pks
-	}
-
-	return json.Marshal(alias)
-}
-
-// UnmarshalJSON unmarshals raw JSON bytes into a ContinuousVestingAccount.
-func (lgva *LazyGradedVestingAccount) UnmarshalJSON(bz []byte) error {
-	var alias vestingAccountPretty
-	if err := json.Unmarshal(bz, &alias); err != nil {
-		return err
-	}
-
-	var (
-		pk  crypto.PubKey
-		err error
-	)
-
-	if alias.PubKey != "" {
-		pk, err = sdk.GetPubKeyFromBech32(sdk.Bech32PubKeyTypeAccPub, alias.PubKey)
-		if err != nil {
-			return err
-		}
-	}
-
-	lgva.BaseVestingAccount = &vesttypes.BaseVestingAccount{
-		BaseAccount:      authtypes.NewBaseAccount(alias.Address, alias.Coins, pk, alias.AccountNumber, alias.Sequence),
-		OriginalVesting:  alias.OriginalVesting,
-		DelegatedFree:    alias.DelegatedFree,
-		DelegatedVesting: alias.DelegatedVesting,
-		EndTime:          alias.EndTime,
-	}
-
-	lgva.VestingSchedules = alias.VestingSchedules
-
-	return nil
-}
-
 // spendableCoins returns all the spendable coins for a vesting account given a
 // set of vesting coins.
 //

x/auth/vesting/types/vesting_account_test.go

@@ -1,7 +1,6 @@
 package types
 
 import (
-	"encoding/json"
 	"errors"
 	"testing"
 	"time"
@@ -378,56 +377,3 @@ func TestGenesisAccountValidate(t *testing.T) {
 		})
 	}
 }
-
-func TestBaseVestingAccountJSON(t *testing.T) {
-	pubkey := secp256k1.GenPrivKey().PubKey()
-	addr := sdk.AccAddress(pubkey.Address())
-	coins := sdk.NewCoins(sdk.NewInt64Coin("test", 5))
-	baseAcc := authtypes.NewBaseAccount(addr, coins, pubkey, 10, 50)
-
-	acc, err := authvesttypes.NewBaseVestingAccount(baseAcc, coins, time.Now().Unix())
-	require.NoError(t, err)
-
-	bz, err := json.Marshal(acc)
-	require.NoError(t, err)
-
-	bz1, err := acc.MarshalJSON()
-	require.NoError(t, err)
-	require.Equal(t, string(bz1), string(bz))
-
-	var a authvesttypes.BaseVestingAccount
-	require.NoError(t, json.Unmarshal(bz, &a))
-	require.Equal(t, acc.String(), a.String())
-}
-
-func TestLazyGradedVestingAccountJSON(t *testing.T) {
-	now := tmtime.Now()
-	endTime := now.Add(24 * time.Hour)
-
-	pubkey := secp256k1.GenPrivKey().PubKey()
-	addr := sdk.AccAddress(pubkey.Address())
-	coins := sdk.NewCoins(sdk.NewInt64Coin("test", 5))
-	baseAcc := authtypes.NewBaseAccount(addr, coins, pubkey, 10, 50)
-
-	baseVesting, err := authvesttypes.NewBaseVestingAccount(baseAcc, coins, now.Unix())
-	acc := NewLazyGradedVestingAccountRaw(baseVesting, VestingSchedules{
-		NewVestingSchedule(feeDenom, []LazySchedule{
-			NewLazySchedule(now.Unix(), endTime.Unix(), sdk.NewDec(1)),
-		}),
-		NewVestingSchedule(stakeDenom, []LazySchedule{
-			NewLazySchedule(now.Unix(), endTime.Unix(), sdk.NewDec(1)),
-		}),
-	})
-	require.NoError(t, err)
-
-	bz, err := json.Marshal(acc)
-	require.NoError(t, err)
-
-	bz1, err := acc.MarshalJSON()
-	require.NoError(t, err)
-	require.Equal(t, string(bz1), string(bz))
-
-	var a LazyGradedVestingAccount
-	require.NoError(t, json.Unmarshal(bz, &a))
-	require.Equal(t, acc.String(), a.String())
-}