forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-07 15:38:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/txpool/blobpool: simplify evictionPriority code

Browse source 
evictionPriority was used in only one place, where we cap it to 0.
Cleaner to do it right in the function.

Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2026-02-04 08:21:06 +01:00
parent a951aacb70
commit ba9d3548d4
No known key found for this signature in database
GPG key ID: 0FE274EE8C95166E
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/txpool/blobpool/evictheap.go
View file

@ -95,13 +95,7 @@ func (h *evictHeap) Less(i, j int) bool {
lastJ := txsJ[len(txsJ)-1] lastJ := txsJ[len(txsJ)-1]
prioI := evictionPriority(h.basefeeJumps, lastI.evictionExecFeeJumps, h.blobfeeJumps, lastI.evictionBlobFeeJumps) prioI := evictionPriority(h.basefeeJumps, lastI.evictionExecFeeJumps, h.blobfeeJumps, lastI.evictionBlobFeeJumps)
if prioI > 0 {
prioI = 0
}
prioJ := evictionPriority(h.basefeeJumps, lastJ.evictionExecFeeJumps, h.blobfeeJumps, lastJ.evictionBlobFeeJumps) prioJ := evictionPriority(h.basefeeJumps, lastJ.evictionExecFeeJumps, h.blobfeeJumps, lastJ.evictionBlobFeeJumps)
if prioJ > 0 {
prioJ = 0
}
if prioI == prioJ { if prioI == prioJ {
return lastI.evictionExecTip.Lt(lastJ.evictionExecTip) return lastI.evictionExecTip.Lt(lastJ.evictionExecTip)
} }

5
core/txpool/blobpool/priority.go
View file

@ -36,10 +36,7 @@ func evictionPriority(basefeeJumps float64, txBasefeeJumps, blobfeeJumps, txBlob
basefeePriority = evictionPriority1D(basefeeJumps, txBasefeeJumps) basefeePriority = evictionPriority1D(basefeeJumps, txBasefeeJumps)
blobfeePriority = evictionPriority1D(blobfeeJumps, txBlobfeeJumps) blobfeePriority = evictionPriority1D(blobfeeJumps, txBlobfeeJumps)
) )
if basefeePriority < blobfeePriority { return min(0, basefeePriority, blobfeePriority)
return basefeePriority
}
return blobfeePriority
} }
// evictionPriority1D calculates the eviction priority based on the algorithm // evictionPriority1D calculates the eviction priority based on the algorithm