set filter into txpool (#245)

* set filter into txpool * fix
yu-org · Nov 19, 2024 · f1e0e94 · f1e0e94
1 parent a3f2de2
commit f1e0e94
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/core/txpool/interface.go b/core/txpool/interface.go
@@ -14,6 +14,8 @@ type ItxPool interface {
 	WithBaseCheck(checkFn TxnChecker) ItxPool
 	WithTripodCheck(tripodName string, checker TxnChecker) ItxPool
 
+	SetPackFilter(fn func(txn *SignedTxn) bool)
+
 	BaseCheck(*SignedTxn) error
 	TripodsCheck(stxn *SignedTxn) error
 

diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
@@ -20,6 +20,8 @@ type TxPool struct {
 
 	baseChecks   []TxnCheckFn
 	tripodChecks map[string]TxnCheckFn
+
+	filter func(txn *SignedTxn) bool
 }
 
 func NewTxPool(nodeType int, cfg *TxpoolConf) *TxPool {
@@ -32,6 +34,7 @@ func NewTxPool(nodeType int, cfg *TxpoolConf) *TxPool {
 		unpackedTxns: ordered,
 		baseChecks:   make([]TxnCheckFn, 0),
 		tripodChecks: make(map[string]TxnCheckFn),
+		filter:       func(*SignedTxn) bool { return true },
 	}
 	return tp
 }
@@ -49,6 +52,10 @@ func (tp *TxPool) withDefaultBaseChecks() *TxPool {
 	return tp
 }
 
+func (tp *TxPool) SetPackFilter(fn func(txn *SignedTxn) bool) {
+	tp.filter = fn
+}
+
 func (tp *TxPool) Capacity() int {
 	return tp.capacity
 }
@@ -115,9 +122,9 @@ func (tp *TxPool) GetAllTxns() ([]*SignedTxn, error) {
 }
 
 func (tp *TxPool) Pack(numLimit uint64) ([]*SignedTxn, error) {
-	return tp.PackFor(numLimit, func(*SignedTxn) bool {
-		return true
-	})
+	metrics.TxpoolSizeGauge.Set(float64(tp.unpackedTxns.Size()))
+	txns := tp.unpackedTxns.Gets(numLimit, tp.filter)
+	return txns, nil
 }
 
 func (tp *TxPool) PackFor(numLimit uint64, filter func(txn *SignedTxn) bool) ([]*SignedTxn, error) {