Merge branch 'master' into powerreduction_param
This commit is contained in:
@@ -96,8 +96,12 @@ func SimulateMsgGrantAuthorization(ak types.AccountKeeper, bk types.BankKeeper,
|
||||
}
|
||||
|
||||
blockTime := ctx.BlockTime()
|
||||
spendLimit := spendableCoins.Sub(fees)
|
||||
if spendLimit == nil {
|
||||
return simtypes.NoOpMsg(types.ModuleName, TypeMsgGrantAuthorization, "spend limit is nil"), nil, nil
|
||||
}
|
||||
msg, err := types.NewMsgGrantAuthorization(granter.Address, grantee.Address,
|
||||
banktype.NewSendAuthorization(spendableCoins.Sub(fees)), blockTime.AddDate(1, 0, 0))
|
||||
banktype.NewSendAuthorization(spendLimit), blockTime.AddDate(1, 0, 0))
|
||||
|
||||
if err != nil {
|
||||
return simtypes.NoOpMsg(types.ModuleName, TypeMsgGrantAuthorization, err.Error()), nil, err
|
||||
@@ -249,7 +253,7 @@ func SimulateMsgExecuteAuthorized(ak types.AccountKeeper, bk types.BankKeeper, k
|
||||
|
||||
msg := types.NewMsgExecAuthorized(grantee.Address, []sdk.ServiceMsg{execMsg})
|
||||
sendGrant := targetGrant.Authorization.GetCachedValue().(*banktype.SendAuthorization)
|
||||
_, _, err = sendGrant.Accept(execMsg, ctx.BlockHeader())
|
||||
_, _, err = sendGrant.Accept(ctx, execMsg)
|
||||
if err != nil {
|
||||
return simtypes.NoOpMsg(types.ModuleName, TypeMsgExecDelegated, err.Error()), nil, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user