types: split pendingRemoval lock scope

pkg/types/ordermap.go

@@ -125,26 +125,34 @@ func (m *SyncOrderMap) Remove(orderID uint64) (exists bool) {
 	return exists
 }
 
-func (m *SyncOrderMap) Add(o Order) {
+func (m *SyncOrderMap) processPendingRemoval() {
+	if len(m.pendingRemoval) == 0 {
+		return
+	}
+
 	m.Lock()
 	defer m.Unlock()
 
-	m.orders.Add(o)
+	expireTime := time.Now().Add(-5 * time.Minute)
-
+	removing := make(map[uint64]struct{})
-	if len(m.pendingRemoval) > 0 {
+	for orderID, creationTime := range m.pendingRemoval {
-		expireTime := time.Now().Add(-5 * time.Minute)
+		if m.orders.Exists(orderID) || creationTime.Before(expireTime) {
-		removing := make(map[uint64]struct{})
+			m.orders.Remove(orderID)
-		for orderID, creationTime := range m.pendingRemoval {
+			removing[orderID] = struct{}{}
-			if m.orders.Exists(orderID) || creationTime.Before(expireTime) {
-				m.orders.Remove(orderID)
-				removing[orderID] = struct{}{}
-			}
-		}
-
-		for orderID := range removing {
-			delete(m.pendingRemoval, orderID)
 		}
 	}
+
+	for orderID := range removing {
+		delete(m.pendingRemoval, orderID)
+	}
+}
+
+func (m *SyncOrderMap) Add(o Order) {
+	m.Lock()
+	m.orders.Add(o)
+	m.Unlock()
+
+	m.processPendingRemoval()
 }
 
 func (m *SyncOrderMap) Update(o Order) {