Merge pull request #594 from libotony/improve-txpool

txpool: minor improvement, ignore local submitted flag when fill pool
vechain · Jul 18, 2023 · b2704f3 · b2704f3
2 parents e664012 + 891c9fe
commit b2704f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmd/thor/node/node.go b/cmd/thor/node/node.go
@@ -245,7 +245,7 @@ func (n *Node) txStashLoop(ctx context.Context) {
 
  {
  txs := stash.LoadAll()
- n.txPool.Fill(txs, false)
+ n.txPool.Fill(txs)
  log.Debug("loaded txs from stash", "count", len(txs))
  }
 

diff --git a/txpool/tx_pool.go b/txpool/tx_pool.go
@@ -199,7 +199,7 @@ func (p *TxPool) Close() {
  log.Debug("closed")
 }
 
-//SubscribeTxEvent receivers will receive a tx
+// SubscribeTxEvent receivers will receive a tx
 func (p *TxPool) SubscribeTxEvent(ch chan *TxEvent) event.Subscription {
  return p.scope.Track(p.txFeed.Subscribe(ch))
 }
@@ -323,15 +323,15 @@ func (p *TxPool) Executables() tx.Transactions {
 }
 
 // Fill fills txs into pool.
-func (p *TxPool) Fill(txs tx.Transactions, localSubmitted bool) {
+func (p *TxPool) Fill(txs tx.Transactions) {
  txObjs := make([]*txObject, 0, len(txs))
  for _, tx := range txs {
  origin, _ := tx.Origin()
  if thor.IsOriginBlocked(origin) || p.blocklist.Contains(origin) {
  continue
  }
  // here we ignore errors
- if txObj, err := resolveTx(tx, localSubmitted); err == nil {
+ if txObj, err := resolveTx(tx, false); err == nil {
  txObjs = append(txObjs, txObj)
  }
  }
@@ -464,8 +464,8 @@ func (p *TxPool) wash(headSummary *chain.BlockSummary) (executables tx.Transacti
  }
 
  p.goes.Go(func() {
+ executable := true
  for _, tx := range toBroadcast {
- executable := true
  p.txFeed.Send(&TxEvent{tx, &executable})
  }
  })