From fcc164fab1a620afd372b1562ec225e413396dc8 Mon Sep 17 00:00:00 2001 From: Sunny Aggarwal Date: Tue, 17 Apr 2018 17:07:55 +0200 Subject: [PATCH] rebase and switch test to amino --- x/bank/keeper_test.go | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/x/bank/keeper_test.go b/x/bank/keeper_test.go index 0f5ce128f..1e160d472 100644 --- a/x/bank/keeper_test.go +++ b/x/bank/keeper_test.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" - oldwire "github.com/tendermint/go-wire" + wire "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/auth" ) @@ -27,14 +27,11 @@ func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey) { func TestCoinKeeper(t *testing.T) { ms, authKey := setupMultiStore() - // wire registration while we're at it ... TODO - var _ = oldwire.RegisterInterface( - struct{ sdk.Account }{}, - oldwire.ConcreteType{&auth.BaseAccount{}, 0x1}, - ) + cdc := wire.NewCodec() + auth.RegisterBaseAccount(cdc) ctx := sdk.NewContext(ms, abci.Header{}, false, nil) - accountMapper := auth.NewAccountMapper(authKey, &auth.BaseAccount{}) + accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{}) coinKeeper := NewCoinKeeper(accountMapper) addr := sdk.Address([]byte("addr1")) @@ -116,14 +113,11 @@ func TestCoinKeeper(t *testing.T) { func TestSendKeeper(t *testing.T) { ms, authKey := setupMultiStore() - // wire registration while we're at it ... TODO - var _ = oldwire.RegisterInterface( - struct{ sdk.Account }{}, - oldwire.ConcreteType{&auth.BaseAccount{}, 0x1}, - ) + cdc := wire.NewCodec() + auth.RegisterBaseAccount(cdc) ctx := sdk.NewContext(ms, abci.Header{}, false, nil) - accountMapper := auth.NewAccountMapper(authKey, &auth.BaseAccount{}) + accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{}) coinKeeper := NewCoinKeeper(accountMapper) sendKeeper := NewSendKeeper(accountMapper) @@ -188,14 +182,11 @@ func TestSendKeeper(t *testing.T) { func TestViewKeeper(t *testing.T) { ms, authKey := setupMultiStore() - // wire registration while we're at it ... TODO - var _ = oldwire.RegisterInterface( - struct{ sdk.Account }{}, - oldwire.ConcreteType{&auth.BaseAccount{}, 0x1}, - ) + cdc := wire.NewCodec() + auth.RegisterBaseAccount(cdc) ctx := sdk.NewContext(ms, abci.Header{}, false, nil) - accountMapper := auth.NewAccountMapper(authKey, &auth.BaseAccount{}) + accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{}) coinKeeper := NewCoinKeeper(accountMapper) viewKeeper := NewViewKeeper(accountMapper)