forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use errors.Join

Browse source
This commit is contained in:
Roberto Bayardo 2024-03-23 11:53:25 -07:00
parent 31a3ae4ccd
commit f160500994
No known key found for this signature in database
GPG key ID: BAD75F1206851CC1
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ethclient/simulated/backend.go
View file

@ -17,6 +17,7 @@
package simulated package simulated
import ( import (
"errors"
"time" "time"
"github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum"
@ -142,18 +143,16 @@ func (n *Backend) Close() error {
n.client.Close() n.client.Close()
n.client = simClient{} n.client = simClient{}
} }
var rerr error // return only last error if there are multiple var err error
if n.beacon != nil { if n.beacon != nil {
rerr = n.beacon.Stop() err = n.beacon.Stop()
n.beacon = nil n.beacon = nil
} }
if n.node != nil { if n.node != nil {
if err := n.node.Close(); err != nil { err = errors.Join(err, n.node.Close())
rerr = err
}
n.node = nil n.node = nil
} }
return rerr return err
} }
// Commit seals a block and moves the chain forward to a new empty block. // Commit seals a block and moves the chain forward to a new empty block.