From 581801579839880849a7d39a8d6ca04b46975492 Mon Sep 17 00:00:00 2001
From: Daniel Liu <liudaniel@qq.com>
Date: Mon, 19 Jan 2026 19:01:22 +0800
Subject: [PATCH] core: simplify function CalcGasLimit

---
 core/block_validator.go | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/core/block_validator.go b/core/block_validator.go
index 008444fbbc..9911239cfd 100644
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -173,23 +173,15 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
 // the target if the baseline gas is lower.
 func CalcGasLimit(parentGasLimit, desiredLimit uint64) uint64 {
 	delta := parentGasLimit/params.GasLimitBoundDivisor - 1
-	limit := parentGasLimit
 	if desiredLimit < params.MinGasLimit {
 		desiredLimit = params.MinGasLimit
 	}
 	// If we're outside our allowed gas range, we try to hone towards them
-	if limit < desiredLimit {
-		limit = parentGasLimit + delta
-		if limit > desiredLimit {
-			limit = desiredLimit
-		}
-		return limit
+	if parentGasLimit < desiredLimit {
+		return min(parentGasLimit+delta, desiredLimit)
 	}
-	if limit > desiredLimit {
-		limit = parentGasLimit - delta
-		if limit < desiredLimit {
-			limit = desiredLimit
-		}
+	if parentGasLimit > desiredLimit {
+		return max(parentGasLimit-delta, desiredLimit)
 	}
-	return limit
+	return parentGasLimit
 }