From e3223c8ec53e8940b21e971ba475bb4ffa753e73 Mon Sep 17 00:00:00 2001 From: lightclient Date: Sat, 25 Jan 2025 17:51:04 -0700 Subject: [PATCH] core/txpool: simplify known conflicts --- core/txpool/legacypool/legacypool.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go index b0cc9340aa..d7c2d6eecd 100644 --- a/core/txpool/legacypool/legacypool.go +++ b/core/txpool/legacypool/legacypool.go @@ -597,14 +597,9 @@ func (pool *LegacyPool) validateTx(tx *types.Transaction) error { } // Authorities cannot conflict with any pending or queued transactions. for _, addr := range auths { - var known bool if list := pool.pending[addr]; list != nil { - known = true - } - if list := pool.queue[addr]; list != nil { - known = true - } - if known { + conflicts = append(conflicts, addr) + } else if list := pool.queue[addr]; list != nil { conflicts = append(conflicts, addr) } }