cerc-io/laconicd-deprecated
19
0
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Sync from fork #74

Merged
0xmuralik merged 232 commits from murali/update-fork into main 2023-01-10 04:50:57 +00:00
Conversation 2 Commits 232 Files Changed 354 +14 -7
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 07202c1295 - Show all commits

4
app/ante/fees.go
View File

@ -32,8 +32,8 @@ func (mpd MinGasPriceDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
minGasPrice := mpd.feesKeeper.GetParams(ctx).MinGasPrice minGasPrice := mpd.feesKeeper.GetParams(ctx).MinGasPrice
// short-circuit if min gas price is 0 // Short-circuit if min gas price is 0 or if simulating
if minGasPrice.IsZero() { if minGasPrice.IsZero() || simulate {
return next(ctx, tx, simulate) return next(ctx, tx, simulate)
} }

9
app/ante/fees_test.go
View File

@ -34,6 +34,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
malleate func() sdk.Tx malleate func() sdk.Tx
expPass bool expPass bool
errMsg string errMsg string
allowPassOnSimulate bool
}{ }{
{ {
"invalid cosmos tx type", "invalid cosmos tx type",
@ -42,6 +43,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
}, },
false, false,
"must be a FeeTx", "must be a FeeTx",
false,
}, },
{ {
"valid cosmos tx with MinGasPrices = 0, gasPrice = 0", "valid cosmos tx with MinGasPrices = 0, gasPrice = 0",
@ -55,6 +57,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
}, },
true, true,
"", "",
false,
}, },
{ {
"valid cosmos tx with MinGasPrices = 0, gasPrice > 0", "valid cosmos tx with MinGasPrices = 0, gasPrice > 0",
@ -68,6 +71,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
}, },
true, true,
"", "",
false,
}, },
{ {
"valid cosmos tx with MinGasPrices = 10, gasPrice = 10", "valid cosmos tx with MinGasPrices = 10, gasPrice = 10",
@ -81,6 +85,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
}, },
true, true,
"", "",
false,
}, },
{ {
"invalid cosmos tx with MinGasPrices = 10, gasPrice = 0", "invalid cosmos tx with MinGasPrices = 10, gasPrice = 0",
@ -94,6 +99,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
}, },
false, false,
"provided fee < minimum global fee", "provided fee < minimum global fee",
true,
}, },
{ {
"invalid cosmos tx with wrong denom", "invalid cosmos tx with wrong denom",
@ -107,6 +113,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
}, },
false, false,
"provided fee < minimum global fee", "provided fee < minimum global fee",
true,
}, },
} }
@ -118,7 +125,7 @@ func (s AnteTestSuite) TestMinGasPriceDecorator() {
dec := ante.NewMinGasPriceDecorator(s.app.FeeMarketKeeper, s.app.EvmKeeper) dec := ante.NewMinGasPriceDecorator(s.app.FeeMarketKeeper, s.app.EvmKeeper)
_, err := dec.AnteHandle(ctx, tc.malleate(), et.simulate, NextFn) _, err := dec.AnteHandle(ctx, tc.malleate(), et.simulate, NextFn)
if tc.expPass { if tc.expPass || (et.simulate && tc.allowPassOnSimulate) {
s.Require().NoError(err, tc.name) s.Require().NoError(err, tc.name)
} else { } else {
s.Require().Error(err, tc.name) s.Require().Error(err, tc.name)