chore: remove nil check of consensusparam.abci, fix eip1559 base fee …

…test
b-harvest · Jan 22, 2024 · c4ccd6c · c4ccd6c
1 parent 9395e7d
commit c4ccd6c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/types/block.go b/types/block.go
@@ -30,7 +30,7 @@ func BlockGasLimit(ctx sdk.Context) uint64 {
 
 	// Otherwise get from the consensus parameters
 	cp := ctx.ConsensusParams()
-	if cp.Abci == nil || cp.Block == nil {
+	if cp.Block == nil {
 		return 0
 	}
 

diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go
@@ -305,7 +305,7 @@ func (k Keeper) EstimateGas(c context.Context, req *types.EthCallRequest) (*type
 	} else {
 		// Query block gas limit
 		params := ctx.ConsensusParams()
-		if params.Abci != nil && params.Block != nil && params.Block.MaxGas > 0 {
+		if params.Block != nil && params.Block.MaxGas > 0 {
 			hi = uint64(params.Block.MaxGas)
 		} else {
 			hi = req.GasCap

diff --git a/x/feemarket/keeper/eip1559.go b/x/feemarket/keeper/eip1559.go
@@ -62,7 +62,7 @@ func (k Keeper) CalculateBaseFee(ctx sdk.Context) *big.Int {
 	gasLimit := new(big.Int).SetUint64(math.MaxUint64)
 
 	// NOTE: a MaxGas equal to -1 means that block gas is unlimited
-	if consParams.Abci != nil && consParams.Block.MaxGas > -1 {
+	if consParams.Block.MaxGas > -1 {
 		gasLimit = big.NewInt(consParams.Block.MaxGas)
 	}
 

diff --git a/x/feemarket/keeper/eip1559_test.go b/x/feemarket/keeper/eip1559_test.go
@@ -39,39 +39,39 @@ func (suite *KeeperTestSuite) TestCalculateBaseFee() {
 			1,
 			50,
 			sdkmath.LegacyZeroDec(),
-			big.NewInt(875000001),
+			suite.app.FeeMarketKeeper.GetParams(suite.ctx).BaseFee.BigInt(),
 		},
 		{
 			"with BaseFee - parent block wanted the same gas as its target, with higher min gas price (ElasticityMultiplier = 2)",
 			false,
 			1,
 			50,
 			sdkmath.LegacyNewDec(1500000000),
-			big.NewInt(1500000000),
+			suite.app.FeeMarketKeeper.GetParams(suite.ctx).BaseFee.BigInt(),
 		},
 		{
 			"with BaseFee - parent block wanted more gas than its target (ElasticityMultiplier = 2)",
 			false,
 			1,
 			100,
 			sdkmath.LegacyZeroDec(),
-			big.NewInt(875000001),
+			big.NewInt(1125000000),
 		},
 		{
 			"with BaseFee - parent block wanted more gas than its target, with higher min gas price (ElasticityMultiplier = 2)",
 			false,
 			1,
 			100,
 			sdkmath.LegacyNewDec(1500000000),
-			big.NewInt(1500000000),
+			big.NewInt(1125000000),
 		},
 		{
 			"with BaseFee - Parent gas wanted smaller than parent gas target (ElasticityMultiplier = 2)",
 			false,
 			1,
 			25,
 			sdkmath.LegacyZeroDec(),
-			big.NewInt(875000001),
+			big.NewInt(937500000),
 		},
 		{
 			"with BaseFee - Parent gas wanted smaller than parent gas target, with higher min gas price (ElasticityMultiplier = 2)",