roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

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

Browse Source 
his function was added in Go 1.20, but our compatibility target
is Go 1.19.
This commit is contained in:
Felix Lange 2023-06-20 13:51:59 +02:00 committed by GitHub
parent 154b016b6c
commit 1affc1c08d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/txpool/txpool.go
View File

@ -17,7 +17,7 @@
package txpool package txpool
import ( import (
"errors" "fmt"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "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 // Terminate the reset loop and wait for it to finish
errc := make(chan error) errc := make(chan error)
p.quit <- errc p.quit <- errc
errs = append(errs, <-errc) if err := <-errc; err != nil {
errs = append(errs, err)
}
// Terminate each subpool // Terminate each subpool
for _, subpool := range p.subpools { 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 // loop is the transaction pool's main event loop, waiting for and reacting to