Commit 90147ac1 authored by Roberto Bayardo's avatar Roberto Bayardo Committed by GitHub

close Backend resources during testing (#9952)

* close backend resources after use during testing

* Update op-chain-ops/genesis/layer_two.go
Co-authored-by: default avatarSebastian Stammler <stammler.s@gmail.com>

---------
Co-authored-by: default avatarSebastian Stammler <stammler.s@gmail.com>
parent 1a4a80e5
...@@ -49,6 +49,7 @@ type Deployer func(*backends.SimulatedBackend, *bind.TransactOpts, Constructor) ...@@ -49,6 +49,7 @@ type Deployer func(*backends.SimulatedBackend, *bind.TransactOpts, Constructor)
// NewL1Backend returns a SimulatedBackend suitable for L1. It has // NewL1Backend returns a SimulatedBackend suitable for L1. It has
// the latest L1 hardforks enabled. // the latest L1 hardforks enabled.
// The returned backend should be closed after use.
func NewL1Backend() (*backends.SimulatedBackend, error) { func NewL1Backend() (*backends.SimulatedBackend, error) {
backend, err := NewBackendWithGenesisTimestamp(ChainID, 0, true, nil) backend, err := NewBackendWithGenesisTimestamp(ChainID, 0, true, nil)
return backend, err return backend, err
...@@ -56,6 +57,7 @@ func NewL1Backend() (*backends.SimulatedBackend, error) { ...@@ -56,6 +57,7 @@ func NewL1Backend() (*backends.SimulatedBackend, error) {
// NewL2Backend returns a SimulatedBackend suitable for L2. // NewL2Backend returns a SimulatedBackend suitable for L2.
// It has the latest L2 hardforks enabled. // It has the latest L2 hardforks enabled.
// The returned backend should be closed after use.
func NewL2Backend() (*backends.SimulatedBackend, error) { func NewL2Backend() (*backends.SimulatedBackend, error) {
backend, err := NewBackendWithGenesisTimestamp(ChainID, 0, false, nil) backend, err := NewBackendWithGenesisTimestamp(ChainID, 0, false, nil)
return backend, err return backend, err
...@@ -63,6 +65,7 @@ func NewL2Backend() (*backends.SimulatedBackend, error) { ...@@ -63,6 +65,7 @@ func NewL2Backend() (*backends.SimulatedBackend, error) {
// NewL2BackendWithChainIDAndPredeploys returns a SimulatedBackend suitable for L2. // NewL2BackendWithChainIDAndPredeploys returns a SimulatedBackend suitable for L2.
// It has the latest L2 hardforks enabled, and allows for the configuration of the network's chain ID and predeploys. // It has the latest L2 hardforks enabled, and allows for the configuration of the network's chain ID and predeploys.
// The returned backend should be closed after use.
func NewL2BackendWithChainIDAndPredeploys(chainID *big.Int, predeploys map[string]*common.Address) (*backends.SimulatedBackend, error) { func NewL2BackendWithChainIDAndPredeploys(chainID *big.Int, predeploys map[string]*common.Address) (*backends.SimulatedBackend, error) {
backend, err := NewBackendWithGenesisTimestamp(chainID, 0, false, predeploys) backend, err := NewBackendWithGenesisTimestamp(chainID, 0, false, predeploys)
return backend, err return backend, err
......
...@@ -81,8 +81,10 @@ func BuildL2Genesis(config *DeployConfig, l1StartBlock *types.Block) (*core.Gene ...@@ -81,8 +81,10 @@ func BuildL2Genesis(config *DeployConfig, l1StartBlock *types.Block) (*core.Gene
} }
deployedBin, err := deployer.DeployWithDeterministicDeployer(backend, name) deployedBin, err := deployer.DeployWithDeterministicDeployer(backend, name)
if err != nil { if err != nil {
backend.Close()
return nil, err return nil, err
} }
backend.Close()
deployResults[name] = deployedBin deployResults[name] = deployedBin
fallthrough fallthrough
case "MultiCall3", "Create2Deployer", "Safe_v130", case "MultiCall3", "Create2Deployer", "Safe_v130",
......
...@@ -166,6 +166,7 @@ func deployContractsWithImmutables(constructors []deployer.Constructor) (Deploym ...@@ -166,6 +166,7 @@ func deployContractsWithImmutables(constructors []deployer.Constructor) (Deploym
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer backend.Close()
deployments, err := deployer.Deploy(backend, constructors, l2ImmutableDeployer) deployments, err := deployer.Deploy(backend, constructors, l2ImmutableDeployer)
if err != nil { if err != nil {
return nil, err return nil, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment