From cb549c94556d3353230a112f26b2563b5523bf31 Mon Sep 17 00:00:00 2001
From: Marius van der Wijden <m.vanderwijden@live.de>
Date: Fri, 1 Dec 2023 11:59:20 +0100
Subject: [PATCH] accounts/abi/bind/backends: fix review comments

---
 accounts/abi/bind/backends/simulated.go | 32 ++++++++++++-------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
index d2b8d313d1..0654ea28f8 100644
--- a/accounts/abi/bind/backends/simulated.go
+++ b/accounts/abi/bind/backends/simulated.go
@@ -28,7 +28,6 @@ import (
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
 	"github.com/ethereum/go-ethereum/eth/filters"
 	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/params"
@@ -48,10 +47,10 @@ type SimulatedBackend struct {
 // A simulated backend always uses chainID 1337.
 func NewSimulatedBackend(alloc core.GenesisAlloc, gasLimit uint64) *SimulatedBackend {
 	// Setup the node object
-	nodeConf := &node.DefaultConfig
+	nodeConf := node.DefaultConfig
 	nodeConf.DataDir = ""
 	nodeConf.P2P = p2p.Config{DiscAddr: "", ListenAddr: ""}
-	stack, err := node.New(nodeConf)
+	stack, err := node.New(&nodeConf)
 	if err != nil {
 		// This should never happen, if it does, please open an issue
 		panic(err)
@@ -63,10 +62,10 @@ func NewSimulatedBackend(alloc core.GenesisAlloc, gasLimit uint64) *SimulatedBac
 		GasLimit: gasLimit,
 		Alloc:    alloc,
 	}
-	conf := &ethconfig.Defaults
+	conf := ethconfig.Defaults
 	conf.Genesis = &genesis
 	conf.SyncMode = downloader.FullSync
-	sim, err := NewSimWithNode(stack, conf, math.MaxUint64)
+	sim, err := NewSimWithNode(stack, &conf, math.MaxUint64)
 	if err != nil {
 		// This should never happen, if it does, please open an issue
 		panic(err)
@@ -76,6 +75,7 @@ func NewSimulatedBackend(alloc core.GenesisAlloc, gasLimit uint64) *SimulatedBac
 
 // NewSimWithNode sets up a simulated backend on an existing node
 // this allows users to do persistent simulations.
+// The provided node must not be started and will be started by NewSimWithNode
 func NewSimWithNode(stack *node.Node, conf *eth.Config, blockPeriod uint64) (*SimulatedBackend, error) {
 	backend, err := eth.New(stack, conf)
 	if err != nil {
@@ -113,16 +113,14 @@ func NewSimWithNode(stack *node.Node, conf *eth.Config, blockPeriod uint64) (*Si
 }
 
 func (n *SimulatedBackend) Close() error {
-	n.Client.Close()
-	return n.SimulatedBeacon.Stop()
-}
-
-// Blockchain is needed for LES-tests
-func (n *SimulatedBackend) Blockchain() *core.BlockChain {
-	return n.eth.BlockChain()
-}
-
-// ChainDB is needed for LES-tests
-func (n *SimulatedBackend) ChainDB() ethdb.Database {
-	return n.eth.ChainDb()
+	if n.Client != nil {
+		n.Client.Close()
+		n.Client = nil
+	}
+	if n.SimulatedBeacon != nil {
+		err := n.SimulatedBeacon.Stop()
+		n.SimulatedBeacon = nil
+		return err
+	}
+	return nil
 }