certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix SendToModuleAccountTest (#8857)

This commit is contained in:
Jonathan Gimeno 2021-03-11 15:20:32 +01:00 committed by GitHub
parent e73cf2b410
commit 280ee4f15e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
x/bank/app_test.go
View File

@ -12,7 +12,6 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/cosmos/cosmos-sdk/x/bank/types"
distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
)
type (
@ -121,85 +120,6 @@ func TestSendNotEnoughBalance(t *testing.T) {
require.Equal(t, res2.GetSequence(), origSeq+1)
}
// A module account cannot be the recipient of bank sends unless it has been marked as such
func TestSendToModuleAcc(t *testing.T) {
tests := []struct {
name string
fromBalance sdk.Coins
msg *types.MsgSend
expSimPass bool
expPass bool
expFromBalance sdk.Coins
expToBalance sdk.Coins
}{
{
name: "Normal module account cannot be the recipient of bank sends",
fromBalance: coins,
msg: types.NewMsgSend(addr1, moduleAccAddr, coins),
expSimPass: false,
expPass: false,
expFromBalance: coins,
expToBalance: sdk.NewCoins(),
},
{
name: "Allowed module account can be the recipient of bank sends",
fromBalance: coins,
msg: types.NewMsgSend(addr1, authtypes.NewModuleAddress(distrtypes.ModuleName), coins),
expPass: true,
expSimPass: true,
expFromBalance: sdk.NewCoins(),
expToBalance: coins,
},
}
for _, test := range tests {
test := test
t.Run(test.name, func(t *testing.T) {
acc := &authtypes.BaseAccount{
Address: test.msg.FromAddress,
}
genAccs := []authtypes.GenesisAccount{acc}
app := simapp.SetupWithGenesisAccounts(genAccs)
ctx := app.BaseApp.NewContext(false, tmproto.Header{})
fromAddr, err := sdk.AccAddressFromBech32(test.msg.FromAddress)
require.NoError(t, err)
toAddr, err := sdk.AccAddressFromBech32(test.msg.ToAddress)
require.NoError(t, err)
require.NoError(t, simapp.FundAccount(app, ctx, fromAddr, test.fromBalance))
app.Commit()
res1 := app.AccountKeeper.GetAccount(ctx, fromAddr)
require.NotNil(t, res1)
require.Equal(t, acc, res1.(*authtypes.BaseAccount))
origAccNum := res1.GetAccountNumber()
origSeq := res1.GetSequence()
header := tmproto.Header{Height: app.LastBlockHeight() + 1}
txGen := simapp.MakeTestEncodingConfig().TxConfig
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{test.msg}, "", []uint64{origAccNum}, []uint64{origSeq}, test.expSimPass, test.expPass, priv1)
if test.expPass {
require.NoError(t, err)
} else {
require.Error(t, err)
}
simapp.CheckBalance(t, app, fromAddr, test.expFromBalance)
simapp.CheckBalance(t, app, toAddr, test.expToBalance)
res2 := app.AccountKeeper.GetAccount(app.NewContext(true, tmproto.Header{}), addr1)
require.NotNil(t, res2)
require.Equal(t, res2.GetAccountNumber(), origAccNum)
require.Equal(t, res2.GetSequence(), origSeq+1)
})
}
}
func TestMsgMultiSendWithAccounts(t *testing.T) {
acc := &authtypes.BaseAccount{
Address: addr1.String(),

68
x/bank/handler_test.go
View File

@ -1,4 +1,4 @@
package bank
package bank_test
import (
"strings"
@ -7,13 +7,20 @@ import (
"github.com/stretchr/testify/require"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/cosmos/cosmos-sdk/x/bank"
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
"github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
)
func TestInvalidMsg(t *testing.T) {
h := NewHandler(nil)
h := bank.NewHandler(nil)
res, err := h(sdk.NewContext(nil, tmproto.Header{}, false, nil), testdata.NewTestMsg())
require.Error(t, err)
@ -22,3 +29,60 @@ func TestInvalidMsg(t *testing.T) {
_, _, log := sdkerrors.ABCIInfo(err, false)
require.True(t, strings.Contains(log, "unrecognized bank message type"))
}
// A module account cannot be the recipient of bank sends unless it has been marked as such
func TestSendToModuleAccount(t *testing.T) {
priv1 := secp256k1.GenPrivKey()
addr1 := sdk.AccAddress(priv1.PubKey().Address())
moduleAccAddr := authtypes.NewModuleAddress(stakingtypes.BondedPoolName)
coins := sdk.Coins{sdk.NewInt64Coin("foocoin", 10)}
tests := []struct {
name string
expectedError error
msg *types.MsgSend
}{
{
name: "not allowed module account",
msg: types.NewMsgSend(addr1, moduleAccAddr, coins),
expectedError: sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "%s is not allowed to receive funds", moduleAccAddr),
},
{
name: "allowed module account",
msg: types.NewMsgSend(addr1, authtypes.NewModuleAddress(stakingtypes.ModuleName), coins),
expectedError: nil,
},
}
acc1 := &authtypes.BaseAccount{
Address: addr1.String(),
}
accs := authtypes.GenesisAccounts{acc1}
balances := []types.Balance{
{
Address: addr1.String(),
Coins: coins,
},
}
app := simapp.SetupWithGenesisAccounts(accs, balances...)
ctx := app.BaseApp.NewContext(false, tmproto.Header{})
app.BankKeeper = bankkeeper.NewBaseKeeper(
app.AppCodec(), app.GetKey(types.StoreKey), app.AccountKeeper, app.GetSubspace(types.ModuleName), map[string]bool{
moduleAccAddr.String(): true,
},
)
handler := bank.NewHandler(app.BankKeeper)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
_, err := handler(ctx, tc.msg)
if tc.expectedError != nil {
require.EqualError(t, err, tc.expectedError.Error())
} else {
require.NoError(t, err)
}
})
}
}