From 98447650c5a5d72adc2ea73e8a8591c02aed920b Mon Sep 17 00:00:00 2001
From: Raul Jordan <raul@prysmaticlabs.com>
Date: Tue, 24 Oct 2023 13:02:44 -0400
Subject: [PATCH] no separate

---
 arbnode/bold.go         | 31 -------------------------------
 cmd/bold-deploy/main.go | 13 ++++++-------
 2 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 arbnode/bold.go

diff --git a/arbnode/bold.go b/arbnode/bold.go
deleted file mode 100644
index 6fec4b9216..0000000000
--- a/arbnode/bold.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package arbnode
-
-import (
-	"context"
-	"errors"
-
-	"github.com/OffchainLabs/bold/solgen/go/rollupgen"
-	"github.com/OffchainLabs/bold/testing/setup"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/offchainlabs/nitro/util/headerreader"
-)
-
-func DeployBOLDOnL1(ctx context.Context, parentChainReader *headerreader.HeaderReader, deployAuth *bind.TransactOpts, batchPoster common.Address, authorizeValidators uint64, config rollupgen.Config) (*setup.RollupAddresses, error) {
-	if config.WasmModuleRoot == (common.Hash{}) {
-		return nil, errors.New("no machine specified")
-	}
-	addresses, err := setup.DeployFullRollupStack(
-		ctx,
-		parentChainReader.Client(),
-		deployAuth,
-		deployAuth.From,
-		config,
-		false, // do not use mock bridge.
-		false, // do not use a mock one step prover
-	)
-	if err != nil {
-		return nil, err
-	}
-	return addresses, nil
-}
diff --git a/cmd/bold-deploy/main.go b/cmd/bold-deploy/main.go
index 30eb7fa79c..c1c608526e 100644
--- a/cmd/bold-deploy/main.go
+++ b/cmd/bold-deploy/main.go
@@ -17,6 +17,7 @@ import (
 	"github.com/OffchainLabs/bold/solgen/go/mocksgen"
 	rollupgen "github.com/OffchainLabs/bold/solgen/go/rollupgen"
 	challenge_testing "github.com/OffchainLabs/bold/testing"
+	"github.com/OffchainLabs/bold/testing/setup"
 
 	"github.com/offchainlabs/nitro/cmd/chaininfo"
 	"github.com/offchainlabs/nitro/cmd/genericconf"
@@ -31,7 +32,6 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
-	"github.com/offchainlabs/nitro/arbnode"
 	"github.com/offchainlabs/nitro/cmd/util"
 )
 
@@ -58,7 +58,6 @@ func main() {
 	l2ChainConfig := flag.String("l2chainconfig", "l2_chain_config.json", "L2 chain config json file")
 	l2ChainName := flag.String("l2chainname", "", "L2 chain name (will be included in chain info output json file)")
 	l2ChainInfo := flag.String("l2chaininfo", "l2_chain_info.json", "L2 chain info output json file")
-	authorizevalidators := flag.Uint64("authorizevalidators", 0, "Number of validators to preemptively authorize")
 	txTimeout := flag.Duration("txtimeout", 10*time.Minute, "Timeout when waiting for a transaction to be included in a block")
 	prod := flag.Bool("prod", false, "Whether to configure the rollup for production or testing")
 	flag.Parse()
@@ -243,14 +242,14 @@ func main() {
 		challenge_testing.WithConfirmPeriodBlocks(uint64(400)), // TODO: Hardcoded to 1000 L1 blocks.
 		challenge_testing.WithChainConfig(string(chainConfigJson)),
 	)
-
-	deployedAddresses, err := arbnode.DeployBOLDOnL1(
+	deployedAddresses, err := setup.DeployFullRollupStack(
 		ctx,
-		l1Reader,
+		l1Reader.Client(),
 		l1TransactionOpts,
-		sequencerAddress,
-		*authorizevalidators,
+		l1TransactionOpts.From,
 		rollupConfig,
+		false, // do not use mock bridge.
+		false, // do not use a mock one step prover
 	)
 	if err != nil {
 		flag.Usage()