go/runtime/txpool: Fix crash on early access

oasisprotocol · Apr 4, 2022 · 8c492c2 · 8c492c2
1 parent 3c1a9d5
commit 8c492c2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/.changelog/4638.bugfix.md b/.changelog/4638.bugfix.md
@@ -0,0 +1 @@
+go/runtime/txpool: Fix crash on early access
diff --git a/go/runtime/txpool/txpool.go b/go/runtime/txpool/txpool.go
@@ -273,6 +273,9 @@ func (t *txPool) RemoveTxBatch(txs []hash.Hash) {
 	t.schedulerLock.Lock()
 	defer t.schedulerLock.Unlock()
 
+	if t.schedulerQueue == nil {
+		return
+	}
 	t.schedulerQueue.RemoveTxBatch(txs)
 
 	pendingScheduleSize.With(t.getMetricLabels()).Set(float64(t.schedulerQueue.Size()))
@@ -282,20 +285,35 @@ func (t *txPool) GetScheduledBatch(force bool) []*transaction.CheckedTransaction
 	t.schedulerLock.Lock()
 	defer t.schedulerLock.Unlock()
 
+	if t.schedulerQueue == nil {
+		return nil
+	}
 	return t.schedulerQueue.GetBatch(force)
 }
 
 func (t *txPool) GetPrioritizedBatch(offset *hash.Hash, limit uint32) []*transaction.CheckedTransaction {
 	t.schedulerLock.Lock()
 	defer t.schedulerLock.Unlock()
 
+	if t.schedulerQueue == nil {
+		return nil
+	}
 	return t.schedulerQueue.GetPrioritizedBatch(offset, limit)
 }
 
 func (t *txPool) GetKnownBatch(batch []hash.Hash) ([]*transaction.CheckedTransaction, map[hash.Hash]int) {
 	t.schedulerLock.Lock()
 	defer t.schedulerLock.Unlock()
 
+	if t.schedulerQueue == nil {
+		result := make([]*transaction.CheckedTransaction, 0, len(batch))
+		missing := make(map[hash.Hash]int)
+		for index, txHash := range batch {
+			result = append(result, nil)
+			missing[txHash] = index
+		}
+		return result, missing
+	}
 	return t.schedulerQueue.GetKnownBatch(batch)
 }