core/txpool: remove use of errors.Join function (#27523)

his function was added in Go 1.20, but our compatibility target
is Go 1.19.
pull/27459/head
Felix Lange 1 year ago committed by GitHub
parent 154b016b6c
commit 1affc1c08d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      core/txpool/txpool.go

@ -17,7 +17,7 @@
package txpool
import (
"errors"
"fmt"
"math/big"
"github.com/ethereum/go-ethereum/common"
@ -88,13 +88,20 @@ func (p *TxPool) Close() error {
// Terminate the reset loop and wait for it to finish
errc := make(chan error)
p.quit <- errc
errs = append(errs, <-errc)
if err := <-errc; err != nil {
errs = append(errs, err)
}
// Terminate each subpool
for _, subpool := range p.subpools {
errs = append(errs, subpool.Close())
if err := subpool.Close(); err != nil {
errs = append(errs, err)
}
}
return errors.Join(errs...)
if len(errs) > 0 {
return fmt.Errorf("subpool close errors: %v", errs)
}
return nil
}
// loop is the transaction pool's main event loop, waiting for and reacting to

Loading…
Cancel
Save