From 18695e660b84a23aa612cb233d0c893db1398615 Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Thu, 6 Feb 2020 17:38:59 +0300
Subject: [PATCH] mempool: drop RemoveOverCapacity(), handle it right in the
 Add()

Simplifies things a lot and removes useless code.
---
 pkg/core/mempool/mem_pool.go | 44 ++++++++++++++----------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/pkg/core/mempool/mem_pool.go b/pkg/core/mempool/mem_pool.go
index 684464fce..a2f3ef9af 100644
--- a/pkg/core/mempool/mem_pool.go
+++ b/pkg/core/mempool/mem_pool.go
@@ -150,23 +150,27 @@ func (mp *Pool) Add(t *transaction.Transaction, fee Feer) error {
 	n := sort.Search(len(mp.verifiedTxes), func(n int) bool {
 		return pItem.CompareTo(mp.verifiedTxes[n]) > 0
 	})
-	mp.verifiedTxes = append(mp.verifiedTxes, pItem)
-	if n != len(mp.verifiedTxes) {
+
+	// We've reached our capacity already.
+	if len(mp.verifiedTxes) == mp.capacity {
+		// Less prioritized than the least prioritized we already have, won't fit.
+		if n == len(mp.verifiedTxes) {
+			mp.lock.Unlock()
+			return ErrOOM
+		}
+		// Ditch the last one.
+		unlucky := mp.verifiedTxes[len(mp.verifiedTxes)-1]
+		delete(mp.verifiedMap, unlucky.txn.Hash())
+		mp.verifiedTxes[len(mp.verifiedTxes)-1] = pItem
+	} else {
+		mp.verifiedTxes = append(mp.verifiedTxes, pItem)
+	}
+	if n != len(mp.verifiedTxes)-1 {
 		copy(mp.verifiedTxes[n+1:], mp.verifiedTxes[n:])
 		mp.verifiedTxes[n] = pItem
 	}
-	mp.lock.Unlock()
-
-	if mp.Count() > mp.capacity {
-		mp.RemoveOverCapacity()
-	}
-	mp.lock.RLock()
-	_, ok := mp.verifiedMap[t.Hash()]
 	updateMempoolMetrics(len(mp.verifiedTxes))
-	mp.lock.RUnlock()
-	if !ok {
-		return ErrOOM
-	}
+	mp.lock.Unlock()
 	return nil
 }
 
@@ -211,20 +215,6 @@ func (mp *Pool) RemoveStale(isOK func(*transaction.Transaction) bool) {
 	mp.lock.Unlock()
 }
 
-// RemoveOverCapacity removes transactions with lowest fees until the total number of transactions
-// in the Pool is within the capacity of the Pool.
-func (mp *Pool) RemoveOverCapacity() {
-	mp.lock.Lock()
-	num := mp.count() - mp.capacity
-	for i := 1; i <= num; i++ {
-		txToDrop := mp.verifiedTxes[len(mp.verifiedTxes)-num].txn
-		delete(mp.verifiedMap, txToDrop.Hash())
-	}
-	mp.verifiedTxes = mp.verifiedTxes[:len(mp.verifiedTxes)-num]
-	updateMempoolMetrics(mp.count())
-	mp.lock.Unlock()
-}
-
 // NewMemPool returns a new Pool struct.
 func NewMemPool(capacity int) Pool {
 	return Pool{