LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge PR #3555: Reintroduce Fees OR Semantics

Browse Source
This commit is contained in:
Alexander Bezobchuk
2019-02-07 18:14:54 -08:00
committed by Jack Zampolin
parent 685bfca1d4
commit 7bc837aa06
13 changed files with 71 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/auth/ante.go
+1 -1
View File
@@ -345,7 +345,7 @@ func EnsureSufficientMempoolFees(ctx sdk.Context, stdFee StdFee) sdk.Result {
requiredFees[i] = sdk.NewCoin(gp.Denom, fee.Ceil().RoundInt())
}
if !stdFee.Amount.IsAllGTE(requiredFees) {
if !stdFee.Amount.IsAnyGTE(requiredFees) {
return sdk.ErrInsufficientFee(
fmt.Sprintf(
"insufficient fees; got: %q required: %q", stdFee.Amount, requiredFees,
x/auth/ante_test.go
+10 -8
View File
@@ -710,8 +710,8 @@ func TestEnsureSufficientMempoolFees(t *testing.T) {
input := setupTestInput()
ctx := input.ctx.WithMinGasPrices(
sdk.DecCoins{
sdk.NewDecCoinFromDec("photino", sdk.NewDecWithPrec(1000000, sdk.Precision)), // 0.0001photino
sdk.NewDecCoinFromDec("stake", sdk.NewDecWithPrec(10000, sdk.Precision)), // 0.000001stake
sdk.NewDecCoinFromDec("photino", sdk.NewDecWithPrec(50000000000000, sdk.Precision)), // 0.0001photino
sdk.NewDecCoinFromDec("stake", sdk.NewDecWithPrec(10000000000000, sdk.Precision)), // 0.000001stake
},
)
@@ -719,14 +719,16 @@ func TestEnsureSufficientMempoolFees(t *testing.T) {
input StdFee
expectedOK bool
}{
{NewStdFee(200000, sdk.Coins{sdk.NewInt64Coin("photino", 5)}), false},
{NewStdFee(200000, sdk.Coins{sdk.NewInt64Coin("stake", 1)}), false},
{NewStdFee(200000, sdk.Coins{sdk.NewInt64Coin("photino", 20)}), false},
{NewStdFee(200000, sdk.Coins{sdk.NewInt64Coin("stake", 2)}), true},
{NewStdFee(200000, sdk.Coins{sdk.NewInt64Coin("photino", 10)}), true},
{
NewStdFee(
200000,
sdk.Coins{
sdk.NewInt64Coin("photino", 20),
sdk.NewInt64Coin("stake", 1),
sdk.NewInt64Coin("photino", 10),
sdk.NewInt64Coin("stake", 2),
},
),
true,
@@ -735,9 +737,9 @@ func TestEnsureSufficientMempoolFees(t *testing.T) {
NewStdFee(
200000,
sdk.Coins{
sdk.NewInt64Coin("atom", 2),
sdk.NewInt64Coin("photino", 20),
sdk.NewInt64Coin("stake", 1),
sdk.NewInt64Coin("atom", 5),
sdk.NewInt64Coin("photino", 10),
sdk.NewInt64Coin("stake", 2),
},
),
true,