pool: make maxSize & totalSize same type

core/txpool/legacypool/legacypool.go

@@ -523,7 +523,7 @@ func (pool *LegacyPool) Stats() (int, int) {
 	return pool.stats()
 }
 
-func (pool *LegacyPool) statsOverflowPool() int {
+func (pool *LegacyPool) statsOverflowPool() uint64 {
 	pool.mu.RLock()
 	defer pool.mu.RUnlock()
 

core/txpool/legacypool/legacypool_test.go

@@ -2268,25 +2268,25 @@ func TestTransferTransactions(t *testing.T) {
 
 	assert.Equal(t, 0, pending, "pending transactions mismatched")
 	assert.Equal(t, 0, queue, "queued transactions mismatched")
-	assert.Equal(t, 1, pool.statsOverflowPool(), "OverflowPool size unexpected")
+	assert.Equal(t, uint64(1), pool.statsOverflowPool(), "OverflowPool size unexpected")
 
 	tx2 := dynamicFeeTx(0, 100000, big.NewInt(3), big.NewInt(2), keys[1])
 	pool.addToOverflowPool([]*types.Transaction{tx2}, true)
-	assert.Equal(t, 1, pool.statsOverflowPool(), "OverflowPool size unexpected")
+	assert.Equal(t, uint64(1), pool.statsOverflowPool(), "OverflowPool size unexpected")
 	<-pool.requestPromoteExecutables(newAccountSet(pool.signer, from))
 	pending, queue = pool.Stats()
 
 	assert.Equal(t, 0, pending, "pending transactions mismatched")
 	assert.Equal(t, 1, queue, "queued transactions mismatched")
-	assert.Equal(t, 0, pool.statsOverflowPool(), "OverflowPool size unexpected")
+	assert.Equal(t, uint64(0), pool.statsOverflowPool(), "OverflowPool size unexpected")
 
 	tx3 := dynamicFeeTx(0, 100000, big.NewInt(3), big.NewInt(2), keys[2])
 	pool.addToOverflowPool([]*types.Transaction{tx3}, true)
 	pending, queue = pool.Stats()
 
 	assert.Equal(t, 1, pending, "pending transactions mismatched")
 	assert.Equal(t, 0, queue, "queued transactions mismatched")
-	assert.Equal(t, 1, pool.statsOverflowPool(), "OverflowPool size unexpected")
+	assert.Equal(t, uint64(1), pool.statsOverflowPool(), "OverflowPool size unexpected")
 }
 
 // Tests that the pool rejects replacement dynamic fee transactions that don't

core/txpool/legacypool/tx_overflowpool.go

@@ -67,7 +67,7 @@ type TxOverflowPool struct {
 	index     map[common.Hash]*txHeapItem
 	mu        sync.RWMutex
 	maxSize   uint64 // Maximum slots
-	totalSize int    // Total number of slots currently
+	totalSize uint64 // Total number of slots currently
 }
 
 func NewTxOverflowPoolHeap(estimatedMaxSize uint64) *TxOverflowPool {
@@ -87,16 +87,16 @@ func (tp *TxOverflowPool) Add(tx *types.Transaction) bool {
 		return false
 	}
 
-	txSlots := numSlots(tx)
+	txSlots := uint64(numSlots(tx))
 
 	// If the transaction is too big to ever fit (and the pool isn't empty right now), reject it
-	if (uint64(txSlots) > tp.maxSize) || (uint64(txSlots) == tp.maxSize && tp.totalSize != 0) {
+	if (txSlots > tp.maxSize) || (txSlots == tp.maxSize && tp.totalSize != 0) {
 		log.Warn("Transaction too large to fit in OverflowPool", "transaction", tx.Hash().String(), "requiredSlots", txSlots, "maxSlots", tp.maxSize)
 		return false
 	}
 
 	// Remove transactions until there is room for the new transaction
-	for uint64(tp.totalSize+txSlots) > tp.maxSize {
+	for tp.totalSize+txSlots > tp.maxSize {
 		if tp.txHeap.Len() == 0 {
 			// No transactions left to remove, cannot make room
 			log.Warn("Not enough space in OverflowPool even after clearing", "transaction", tx.Hash().String())
@@ -109,7 +109,7 @@ func (tp *TxOverflowPool) Add(tx *types.Transaction) bool {
 			return false
 		}
 		delete(tp.index, oldestItem.tx.Hash())
-		tp.totalSize -= numSlots(oldestItem.tx)
+		tp.totalSize -= uint64(numSlots(oldestItem.tx))
 		OverflowPoolGauge.Dec(1)
 	}
 
@@ -141,7 +141,7 @@ func (tp *TxOverflowPool) Remove(hash common.Hash) {
 	if item, ok := tp.index[hash]; ok {
 		heap.Remove(&tp.txHeap, item.index)
 		delete(tp.index, hash)
-		tp.totalSize -= numSlots(item.tx)
+		tp.totalSize -= uint64(numSlots(item.tx))
 		OverflowPoolGauge.Dec(1)
 	}
 }
@@ -160,7 +160,7 @@ func (tp *TxOverflowPool) Flush(n int) []*types.Transaction {
 		}
 		txs[i] = item.tx
 		delete(tp.index, item.tx.Hash())
-		tp.totalSize -= numSlots(item.tx)
+		tp.totalSize -= uint64(numSlots(item.tx))
 	}
 
 	OverflowPoolGauge.Dec(int64(n))
@@ -173,7 +173,7 @@ func (tp *TxOverflowPool) Len() int {
 	return tp.txHeap.Len()
 }
 
-func (tp *TxOverflowPool) Size() int {
+func (tp *TxOverflowPool) Size() uint64 {
 	tp.mu.RLock()
 	defer tp.mu.RUnlock()
 	return tp.totalSize

core/txpool/legacypool/tx_overflowpool_test.go

@@ -185,7 +185,7 @@ func TestTxOverflowPoolSlotCalculation(t *testing.T) {
 	// Create a third transaction with more slots than tx1
 	tx3Added := pool.Add(tx3)
 	assert.Equal(t, false, tx3Added)
-	assert.Equal(t, 2, pool.totalSize)
+	assert.Equal(t, uint64(2), pool.totalSize)
 
 	// Verify that the pool length remains at 2
 	assert.Equal(t, 2, pool.Len(), "Expected pool size 2 after overflow")