Remove block timer interface from mempool (ava-labs#2720)

Author: StephenButtolph

vms/avm/txs/mempool/mempool.go

@@ -40,13 +40,6 @@ var (
 	errConflictsWithOtherTx = errors.New("tx conflicts with other tx")
 )
 
-type BlockTimer interface {
-	// ResetBlockTimer schedules a timer to notify the consensus engine once
-	// there is a block ready to be built. If a block is ready to be built when
-	// this function is called, the engine will be notified directly.
-	ResetBlockTimer()
-}
-
 // Mempool contains transactions that have not yet been put into a block.
 type Mempool interface {
 	Add(tx *txs.Tx) error
@@ -79,14 +72,11 @@ type mempool struct {
 	droppedTxIDs *cache.LRU[ids.ID, string]
 
 	consumedUTXOs set.Set[ids.ID]
-
-	blkTimer BlockTimer
 }
 
 func New(
 	namespace string,
 	registerer prometheus.Registerer,
-	blkTimer BlockTimer,
 ) (Mempool, error) {
 	bytesAvailableMetric := prometheus.NewGauge(prometheus.GaugeOpts{
 		Namespace: namespace,
@@ -114,7 +104,6 @@ func New(
 		numTxs:               numTxsMetric,
 		droppedTxIDs:         &cache.LRU[ids.ID, string]{Size: droppedTxIDsCacheSize},
 		consumedUTXOs:        set.NewSet[ids.ID](initialConsumedUTXOsSize),
-		blkTimer:             blkTimer,
 	}, nil
 }
 
@@ -159,8 +148,6 @@ func (m *mempool) Add(tx *txs.Tx) error {
 
 	// An explicitly added tx must not be marked as dropped.
 	m.droppedTxIDs.Evict(txID)
-
-	m.blkTimer.ResetBlockTimer()
 	return nil
 }
 

vms/avm/txs/mempool/mempool_test.go

@@ -21,24 +21,18 @@ import (
 )
 
 var (
-	_ BlockTimer = (*noopBlkTimer)(nil)
-
 	keys    = secp256k1.TestKeys()
 	chainID = ids.ID{5, 4, 3, 2, 1}
 	assetID = ids.ID{1, 2, 3}
 )
 
-type noopBlkTimer struct{}
-
-func (*noopBlkTimer) ResetBlockTimer() {}
-
 // shows that valid tx is not added to mempool if this would exceed its maximum
 // size
 func TestBlockBuilderMaxMempoolSizeHandling(t *testing.T) {
 	require := require.New(t)
 
 	registerer := prometheus.NewRegistry()
-	mempoolIntf, err := New("mempool", registerer, &noopBlkTimer{})
+	mempoolIntf, err := New("mempool", registerer)
 	require.NoError(err)
 
 	mempool := mempoolIntf.(*mempool)
@@ -63,7 +57,7 @@ func TestTxsInMempool(t *testing.T) {
 	require := require.New(t)
 
 	registerer := prometheus.NewRegistry()
-	mempool, err := New("mempool", registerer, &noopBlkTimer{})
+	mempool, err := New("mempool", registerer)
 	require.NoError(err)
 
 	testTxs := createTestTxs(2)