core: remove unused error from TxPool.Pending (#23720)

This commit is contained in:
jwasinger
2021-10-13 23:00:45 +02:00
committed by GitHub
parent 79b727bc8a
commit 011fe3eb5e
8 changed files with 9 additions and 23 deletions

View File

@ -240,10 +240,7 @@ func (b *EthAPIBackend) SendTx(ctx context.Context, signedTx *types.Transaction)
}
func (b *EthAPIBackend) GetPoolTransactions() (types.Transactions, error) {
pending, err := b.eth.txPool.Pending(false)
if err != nil {
return nil, err
}
pending := b.eth.txPool.Pending(false)
var txs types.Transactions
for _, batch := range pending {
txs = append(txs, batch...)

View File

@ -126,10 +126,7 @@ func (api *consensusAPI) AssembleBlock(params assembleBlockParams) (*executableD
time.Sleep(wait)
}
pending, err := pool.Pending(true)
if err != nil {
return nil, err
}
pending := pool.Pending(true)
coinbase, err := api.eth.Etherbase()
if err != nil {

View File

@ -66,7 +66,7 @@ type txPool interface {
// Pending should return pending transactions.
// The slice should be modifiable by the caller.
Pending(enforceTips bool) (map[common.Address]types.Transactions, error)
Pending(enforceTips bool) map[common.Address]types.Transactions
// SubscribeNewTxsEvent should return an event subscription of
// NewTxsEvent and send events to the given channel.

View File

@ -91,7 +91,7 @@ func (p *testTxPool) AddRemotes(txs []*types.Transaction) []error {
}
// Pending returns all the transactions known to the pool
func (p *testTxPool) Pending(enforceTips bool) (map[common.Address]types.Transactions, error) {
func (p *testTxPool) Pending(enforceTips bool) map[common.Address]types.Transactions {
p.lock.RLock()
defer p.lock.RUnlock()
@ -103,7 +103,7 @@ func (p *testTxPool) Pending(enforceTips bool) (map[common.Address]types.Transac
for _, batch := range batches {
sort.Sort(types.TxByNonce(batch))
}
return batches, nil
return batches
}
// SubscribeNewTxsEvent should return an event subscription of NewTxsEvent and

View File

@ -43,7 +43,7 @@ func (h *handler) syncTransactions(p *eth.Peer) {
//
// TODO(karalabe): Figure out if we could get away with random order somehow
var txs types.Transactions
pending, _ := h.txpool.Pending(false)
pending := h.txpool.Pending(false)
for _, batch := range pending {
txs = append(txs, batch...)
}