refactor!: remove v0 mempool

celestiaorg · Jun 11, 2024 · 7787416 · 7787416
1 parent abc5163
commit 7787416
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 2,508 deletions.
diff --git a/config/config.go b/config/config.go
@@ -27,9 +27,7 @@ const (
 	// DefaultLogLevel defines a default log level as INFO.
 	DefaultLogLevel = "info"
 
-	// Mempool versions. V1 is prioritized mempool, v0 is regular mempool.
-	// Default is v0.
-	MempoolV0 = "v0"
+    // Mempool versions. v1 (prioritized) is the current default.
 	MempoolV1 = "v1"
 	MempoolV2 = "v2"
 )

diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go
@@ -24,7 +24,6 @@ import (
 
 	cfg "github.com/cometbft/cometbft/config"
 	mempoolv2 "github.com/cometbft/cometbft/mempool/cat"
-	mempoolv0 "github.com/cometbft/cometbft/mempool/v0"
 	mempoolv1 "github.com/cometbft/cometbft/mempool/v1"
 	"github.com/cometbft/cometbft/p2p"
 	cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus"
@@ -75,12 +74,6 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 		var mempool mempl.Mempool
 
 		switch thisConfig.Mempool.Version {
-		case cfg.MempoolV0:
-			mempool = mempoolv0.NewCListMempool(config.Mempool,
-				proxyAppConnConMem,
-				state.LastBlockHeight,
-				mempoolv0.WithPreCheck(sm.TxPreCheck(state)),
-				mempoolv0.WithPostCheck(sm.TxPostCheck(state)))
 		case cfg.MempoolV1:
 			mempool = mempoolv1.NewTxMempool(logger,
 				config.Mempool,

diff --git a/consensus/common_test.go b/consensus/common_test.go
@@ -30,7 +30,6 @@ import (
 	cmtsync "github.com/cometbft/cometbft/libs/sync"
 	mempl "github.com/cometbft/cometbft/mempool"
 	mempoolv2 "github.com/cometbft/cometbft/mempool/cat"
-	mempoolv0 "github.com/cometbft/cometbft/mempool/v0"
 	mempoolv1 "github.com/cometbft/cometbft/mempool/v1"
 	"github.com/cometbft/cometbft/p2p"
 	"github.com/cometbft/cometbft/privval"
@@ -402,13 +401,6 @@ func newStateWithConfigAndBlockStore(
 	var mempool mempl.Mempool
 
 	switch config.Mempool.Version {
-	case cfg.MempoolV0:
-		mempool = mempoolv0.NewCListMempool(config.Mempool,
-			proxyAppConnConMem,
-			state.LastBlockHeight,
-			mempoolv0.WithMetrics(memplMetrics),
-			mempoolv0.WithPreCheck(sm.TxPreCheck(state)),
-			mempoolv0.WithPostCheck(sm.TxPostCheck(state)))
 	case cfg.MempoolV1:
 		logger := consensusLogger()
 		mempool = mempoolv1.NewTxMempool(logger,

diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go
@@ -31,7 +31,6 @@ import (
 	cmtsync "github.com/cometbft/cometbft/libs/sync"
 	mempl "github.com/cometbft/cometbft/mempool"
 	mempoolv2 "github.com/cometbft/cometbft/mempool/cat"
-	mempoolv0 "github.com/cometbft/cometbft/mempool/v0"
 	mempoolv1 "github.com/cometbft/cometbft/mempool/v1"
 	"github.com/cometbft/cometbft/p2p"
 	p2pmock "github.com/cometbft/cometbft/p2p/mock"
@@ -169,13 +168,6 @@ func TestReactorWithEvidence(t *testing.T) {
 		var mempool mempl.Mempool
 
 		switch config.Mempool.Version {
-		case cfg.MempoolV0:
-			mempool = mempoolv0.NewCListMempool(config.Mempool,
-				proxyAppConnConMem,
-				state.LastBlockHeight,
-				mempoolv0.WithMetrics(memplMetrics),
-				mempoolv0.WithPreCheck(sm.TxPreCheck(state)),
-				mempoolv0.WithPostCheck(sm.TxPostCheck(state)))
 		case cfg.MempoolV1:
 			mempool = mempoolv1.NewTxMempool(logger,
 				config.Mempool,

diff --git a/mempool/v0/bench_test.go b/mempool/v0/bench_test.go
diff --git a/mempool/v0/cache_test.go b/mempool/v0/cache_test.go