Commit fd3d7c91 authored by Joshua Gutow's avatar Joshua Gutow

op-batcher: Reorganize files

This places most of the files into a single folder.
parent 740e63d1
package op_batcher package batcher
import ( import (
"context" "context"
......
package op_batcher package batcher
import ( import (
"bytes" "bytes"
......
package op_batcher package batcher
import ( import (
"time" "time"
......
package op_batcher package batcher
import ( import (
"context" "context"
...@@ -12,7 +12,6 @@ import ( ...@@ -12,7 +12,6 @@ import (
"time" "time"
hdwallet "github.com/ethereum-optimism/go-ethereum-hdwallet" hdwallet "github.com/ethereum-optimism/go-ethereum-hdwallet"
"github.com/ethereum-optimism/optimism/op-batcher/sequencer"
"github.com/ethereum-optimism/optimism/op-node/eth" "github.com/ethereum-optimism/optimism/op-node/eth"
"github.com/ethereum-optimism/optimism/op-proposer/txmgr" "github.com/ethereum-optimism/optimism/op-proposer/txmgr"
"github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts"
...@@ -27,7 +26,7 @@ import ( ...@@ -27,7 +26,7 @@ import (
type BatchSubmitter struct { type BatchSubmitter struct {
txMgr *TransactionManager txMgr *TransactionManager
addr common.Address addr common.Address
cfg sequencer.Config cfg DriverConfig
wg sync.WaitGroup wg sync.WaitGroup
done chan struct{} done chan struct{}
log log.Logger log log.Logger
...@@ -141,7 +140,7 @@ func NewBatchSubmitterWithSigner(cfg Config, addr common.Address, signer SignerF ...@@ -141,7 +140,7 @@ func NewBatchSubmitterWithSigner(cfg Config, addr common.Address, signer SignerF
SafeAbortNonceTooLowCount: cfg.SafeAbortNonceTooLowCount, SafeAbortNonceTooLowCount: cfg.SafeAbortNonceTooLowCount,
} }
batcherCfg := sequencer.Config{ batcherCfg := DriverConfig{
Log: l, Log: l,
Name: "Batch Submitter", Name: "Batch Submitter",
L1Client: l1Client, L1Client: l1Client,
......
package sequencer package batcher
import ( import (
"math/big" "math/big"
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
) )
type Config struct { type DriverConfig struct {
Log log.Logger Log log.Logger
Name string Name string
......
package op_batcher package batcher
import ( import (
"context" "context"
......
package op_batcher package batcher
import ( import (
"context" "context"
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"github.com/urfave/cli" "github.com/urfave/cli"
batcher "github.com/ethereum-optimism/optimism/op-batcher" "github.com/ethereum-optimism/optimism/op-batcher/batcher"
"github.com/ethereum-optimism/optimism/op-batcher/flags" "github.com/ethereum-optimism/optimism/op-batcher/flags"
oplog "github.com/ethereum-optimism/optimism/op-service/log" oplog "github.com/ethereum-optimism/optimism/op-service/log"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
......
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