Skip to content

Commit 4a40269

Browse files
protolambdaprotolambda
committed
Merge branch 'develop' into generic-flag-fix
2 parents 5733f33 + 2fd2508 commit 4a40269

File tree

109 files changed

+118
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+118
-119
lines changed

‎indexer/node/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ func (c *client) FilterLogs(query ethereum.FilterQuery) ([]types.Log, error) {
193193
return result, err
194194
}
195195

196-
// Modeled off op-node/client.go. We can refactor this once the client/metrics portion
197-
// of op-node/client has been generalized
196+
// Modeled off op-service/client.go. We can refactor this once the client/metrics portion
197+
// of op-service/client has been generalized
198198

199199
type RPC interface {
200200
Close()

‎op-batcher/batcher/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"github.com/ethereum-optimism/optimism/op-batcher/flags"
1212
"github.com/ethereum-optimism/optimism/op-batcher/metrics"
1313
"github.com/ethereum-optimism/optimism/op-node/rollup"
14-
"github.com/ethereum-optimism/optimism/op-node/sources"
1514
oplog "github.com/ethereum-optimism/optimism/op-service/log"
1615
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
1716
oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
1817
oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
18+
"github.com/ethereum-optimism/optimism/op-service/sources"
1919
"github.com/ethereum-optimism/optimism/op-service/txmgr"
2020
)
2121

‎op-batcher/batcher/driver.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/ethereum-optimism/optimism/op-batcher/metrics"
1414
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
15-
opclient "github.com/ethereum-optimism/optimism/op-service/client"
15+
"github.com/ethereum-optimism/optimism/op-service/dial"
1616
"github.com/ethereum-optimism/optimism/op-service/eth"
1717
"github.com/ethereum-optimism/optimism/op-service/txmgr"
1818
"github.com/ethereum/go-ethereum/core"
@@ -50,17 +50,17 @@ func NewBatchSubmitterFromCLIConfig(cfg CLIConfig, l log.Logger, m metrics.Metri
5050

5151
// Connect to L1 and L2 providers. Perform these last since they are the
5252
// most expensive.
53-
l1Client, err := opclient.DialEthClientWithTimeout(opclient.DefaultDialTimeout, l, cfg.L1EthRpc)
53+
l1Client, err := dial.DialEthClientWithTimeout(dial.DefaultDialTimeout, l, cfg.L1EthRpc)
5454
if err != nil {
5555
return nil, err
5656
}
5757

58-
l2Client, err := opclient.DialEthClientWithTimeout(opclient.DefaultDialTimeout, l, cfg.L2EthRpc)
58+
l2Client, err := dial.DialEthClientWithTimeout(dial.DefaultDialTimeout, l, cfg.L2EthRpc)
5959
if err != nil {
6060
return nil, err
6161
}
6262

63-
rollupClient, err := opclient.DialRollupClientWithTimeout(opclient.DefaultDialTimeout, l, cfg.RollupRpc)
63+
rollupClient, err := dial.DialRollupClientWithTimeout(dial.DefaultDialTimeout, l, cfg.RollupRpc)
6464
if err != nil {
6565
return nil, err
6666
}

‎op-challenger/game/fault/trace/outputs/provider.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
8-
"github.com/ethereum-optimism/optimism/op-service/client"
8+
"github.com/ethereum-optimism/optimism/op-service/dial"
99
"github.com/ethereum-optimism/optimism/op-service/eth"
1010

1111
"github.com/ethereum/go-ethereum/common"
@@ -34,7 +34,7 @@ type OutputTraceProvider struct {
3434
}
3535

3636
func NewTraceProvider(ctx context.Context, logger log.Logger, rollupRpc string, gameDepth, prestateBlock, poststateBlock uint64) (*OutputTraceProvider, error) {
37-
rollupClient, err := client.DialRollupClientWithTimeout(client.DefaultDialTimeout, logger, rollupRpc)
37+
rollupClient, err := dial.DialRollupClientWithTimeout(dial.DefaultDialTimeout, logger, rollupRpc)
3838
if err != nil {
3939
return nil, err
4040
}

‎op-challenger/game/service.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/ethereum-optimism/optimism/op-challenger/game/scheduler"
1111
"github.com/ethereum-optimism/optimism/op-challenger/metrics"
1212
"github.com/ethereum-optimism/optimism/op-challenger/version"
13-
opClient "github.com/ethereum-optimism/optimism/op-node/client"
14-
"github.com/ethereum-optimism/optimism/op-service/client"
13+
opClient "github.com/ethereum-optimism/optimism/op-service/client"
1514
"github.com/ethereum-optimism/optimism/op-service/clock"
15+
"github.com/ethereum-optimism/optimism/op-service/dial"
1616
oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
1717
"github.com/ethereum-optimism/optimism/op-service/txmgr"
1818
"github.com/ethereum/go-ethereum/common"
@@ -35,7 +35,7 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*Se
3535
return nil, fmt.Errorf("failed to create the transaction manager: %w", err)
3636
}
3737

38-
l1Client, err := client.DialEthClientWithTimeout(client.DefaultDialTimeout, logger, cfg.L1EthRpc)
38+
l1Client, err := dial.DialEthClientWithTimeout(dial.DefaultDialTimeout, logger, cfg.L1EthRpc)
3939
if err != nil {
4040
return nil, fmt.Errorf("failed to dial L1: %w", err)
4141
}

‎op-e2e/actions/l1_replica.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"github.com/ethereum/go-ethereum/p2p"
1616
"github.com/stretchr/testify/require"
1717

18-
"github.com/ethereum-optimism/optimism/op-node/client"
1918
"github.com/ethereum-optimism/optimism/op-node/rollup"
20-
"github.com/ethereum-optimism/optimism/op-node/sources"
21-
"github.com/ethereum-optimism/optimism/op-node/testutils"
19+
"github.com/ethereum-optimism/optimism/op-service/client"
20+
"github.com/ethereum-optimism/optimism/op-service/sources"
21+
"github.com/ethereum-optimism/optimism/op-service/testutils"
2222
)
2323

2424
// L1CanonSrc is used to sync L1 from another node.

‎op-e2e/actions/l1_replica_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/stretchr/testify/require"
1616

1717
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
18-
"github.com/ethereum-optimism/optimism/op-node/sources"
1918
"github.com/ethereum-optimism/optimism/op-service/eth"
19+
"github.com/ethereum-optimism/optimism/op-service/sources"
2020
"github.com/ethereum-optimism/optimism/op-service/testlog"
2121
)
2222

‎op-e2e/actions/l2_engine.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
"github.com/ethereum/go-ethereum/node"
2424
"github.com/ethereum/go-ethereum/rpc"
2525

26-
"github.com/ethereum-optimism/optimism/op-node/client"
2726
"github.com/ethereum-optimism/optimism/op-node/rollup"
28-
"github.com/ethereum-optimism/optimism/op-node/sources"
29-
"github.com/ethereum-optimism/optimism/op-node/testutils"
27+
"github.com/ethereum-optimism/optimism/op-service/client"
3028
"github.com/ethereum-optimism/optimism/op-service/eth"
29+
"github.com/ethereum-optimism/optimism/op-service/sources"
30+
"github.com/ethereum-optimism/optimism/op-service/testutils"
3131
)
3232

3333
// L2Engine is an in-memory implementation of the Engine API,

‎op-e2e/actions/l2_engine_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"github.com/ethereum/go-ethereum/log"
2121

2222
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
23-
"github.com/ethereum-optimism/optimism/op-node/sources"
2423
"github.com/ethereum-optimism/optimism/op-service/eth"
24+
"github.com/ethereum-optimism/optimism/op-service/sources"
2525
"github.com/ethereum-optimism/optimism/op-service/testlog"
2626
)
2727

‎op-e2e/actions/l2_proposer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"github.com/stretchr/testify/require"
1919

2020
"github.com/ethereum-optimism/optimism/op-bindings/bindings"
21-
"github.com/ethereum-optimism/optimism/op-node/sources"
2221
"github.com/ethereum-optimism/optimism/op-proposer/metrics"
2322
"github.com/ethereum-optimism/optimism/op-proposer/proposer"
23+
"github.com/ethereum-optimism/optimism/op-service/sources"
2424
"github.com/ethereum-optimism/optimism/op-service/txmgr"
2525
)
2626

‎op-e2e/actions/l2_sequencer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/stretchr/testify/require"
1313

1414
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
15-
"github.com/ethereum-optimism/optimism/op-node/sources"
15+
"github.com/ethereum-optimism/optimism/op-service/sources"
1616
"github.com/ethereum-optimism/optimism/op-service/testlog"
1717
)
1818

‎op-e2e/actions/l2_verifier.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import (
1111
"github.com/ethereum/go-ethereum/rpc"
1212
"github.com/stretchr/testify/require"
1313

14-
"github.com/ethereum-optimism/optimism/op-node/client"
1514
"github.com/ethereum-optimism/optimism/op-node/node"
1615
"github.com/ethereum-optimism/optimism/op-node/rollup"
1716
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
1817
"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
1918
"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
20-
"github.com/ethereum-optimism/optimism/op-node/sources"
21-
"github.com/ethereum-optimism/optimism/op-node/testutils"
19+
"github.com/ethereum-optimism/optimism/op-service/client"
2220
"github.com/ethereum-optimism/optimism/op-service/eth"
21+
"github.com/ethereum-optimism/optimism/op-service/sources"
22+
"github.com/ethereum-optimism/optimism/op-service/testutils"
2323
)
2424

2525
// L2Verifier is an actor that functions like a rollup node,

‎op-e2e/actions/reorg_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/stretchr/testify/require"
1515

1616
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
17-
"github.com/ethereum-optimism/optimism/op-node/client"
1817
"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
19-
"github.com/ethereum-optimism/optimism/op-node/sources"
18+
"github.com/ethereum-optimism/optimism/op-service/client"
2019
"github.com/ethereum-optimism/optimism/op-service/eth"
20+
"github.com/ethereum-optimism/optimism/op-service/sources"
2121
"github.com/ethereum-optimism/optimism/op-service/testlog"
2222
)
2323

‎op-e2e/actions/sync_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
99
"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
10-
"github.com/ethereum-optimism/optimism/op-node/sources"
1110
"github.com/ethereum-optimism/optimism/op-service/eth"
11+
"github.com/ethereum-optimism/optimism/op-service/sources"
1212
"github.com/ethereum-optimism/optimism/op-service/testlog"
1313
"github.com/ethereum/go-ethereum/log"
1414
"github.com/stretchr/testify/require"

‎op-e2e/op_geth.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"github.com/ethereum-optimism/optimism/op-e2e/config"
1313
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
1414
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/geth"
15-
"github.com/ethereum-optimism/optimism/op-node/client"
1615
"github.com/ethereum-optimism/optimism/op-node/rollup"
1716
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
18-
"github.com/ethereum-optimism/optimism/op-node/sources"
17+
"github.com/ethereum-optimism/optimism/op-service/client"
1918
"github.com/ethereum-optimism/optimism/op-service/eth"
19+
"github.com/ethereum-optimism/optimism/op-service/sources"
2020
"github.com/ethereum-optimism/optimism/op-service/testlog"
2121
"github.com/ethereum/go-ethereum/common/hexutil"
2222
"github.com/ethereum/go-ethereum/core/types"

‎op-e2e/setup.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ import (
5050
"github.com/ethereum-optimism/optimism/op-node/p2p/store"
5151
"github.com/ethereum-optimism/optimism/op-node/rollup"
5252
"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
53-
"github.com/ethereum-optimism/optimism/op-node/sources"
5453
proposermetrics "github.com/ethereum-optimism/optimism/op-proposer/metrics"
5554
l2os "github.com/ethereum-optimism/optimism/op-proposer/proposer"
5655
"github.com/ethereum-optimism/optimism/op-service/cliapp"
5756
"github.com/ethereum-optimism/optimism/op-service/clock"
5857
"github.com/ethereum-optimism/optimism/op-service/eth"
5958
oplog "github.com/ethereum-optimism/optimism/op-service/log"
59+
"github.com/ethereum-optimism/optimism/op-service/sources"
6060
"github.com/ethereum-optimism/optimism/op-service/testlog"
6161
"github.com/ethereum-optimism/optimism/op-service/txmgr"
6262
)

‎op-e2e/system_adminrpc_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"time"
77

88
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
9-
"github.com/ethereum-optimism/optimism/op-node/client"
109
"github.com/ethereum-optimism/optimism/op-node/node"
11-
"github.com/ethereum-optimism/optimism/op-node/sources"
10+
"github.com/ethereum-optimism/optimism/op-service/client"
11+
"github.com/ethereum-optimism/optimism/op-service/sources"
1212
"github.com/ethereum/go-ethereum/common"
1313
"github.com/ethereum/go-ethereum/rpc"
1414
"github.com/stretchr/testify/require"

‎op-e2e/system_fpp_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"time"
88

99
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/geth"
10-
"github.com/ethereum-optimism/optimism/op-node/client"
11-
"github.com/ethereum-optimism/optimism/op-node/sources"
1210
"github.com/ethereum-optimism/optimism/op-program/client/driver"
1311
opp "github.com/ethereum-optimism/optimism/op-program/host"
1412
oppconf "github.com/ethereum-optimism/optimism/op-program/host/config"
13+
"github.com/ethereum-optimism/optimism/op-service/client"
14+
"github.com/ethereum-optimism/optimism/op-service/sources"
1515
"github.com/ethereum-optimism/optimism/op-service/testlog"
1616
"github.com/ethereum/go-ethereum/accounts/abi/bind"
1717
"github.com/ethereum/go-ethereum/common"

‎op-e2e/system_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ import (
3232
"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
3333
"github.com/ethereum-optimism/optimism/op-e2e/config"
3434
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
35-
"github.com/ethereum-optimism/optimism/op-node/client"
3635
"github.com/ethereum-optimism/optimism/op-node/metrics"
3736
rollupNode "github.com/ethereum-optimism/optimism/op-node/node"
3837
"github.com/ethereum-optimism/optimism/op-node/p2p"
3938
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
4039
"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
41-
"github.com/ethereum-optimism/optimism/op-node/sources"
40+
"github.com/ethereum-optimism/optimism/op-service/client"
4241
"github.com/ethereum-optimism/optimism/op-service/eth"
4342
oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
4443
"github.com/ethereum-optimism/optimism/op-service/retry"
44+
"github.com/ethereum-optimism/optimism/op-service/sources"
4545
"github.com/ethereum-optimism/optimism/op-service/testlog"
4646
)
4747

‎op-e2e/system_tob_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
1616
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/geth"
1717
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
18-
"github.com/ethereum-optimism/optimism/op-node/testutils/fuzzerutils"
1918
"github.com/ethereum-optimism/optimism/op-node/withdrawals"
19+
"github.com/ethereum-optimism/optimism/op-service/testutils/fuzzerutils"
2020
"github.com/ethereum/go-ethereum/accounts"
2121
"github.com/ethereum/go-ethereum/accounts/abi"
2222
"github.com/ethereum/go-ethereum/accounts/abi/bind"

‎op-node/flags/flags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"time"
77

88
"github.com/ethereum-optimism/optimism/op-node/chaincfg"
9-
"github.com/ethereum-optimism/optimism/op-node/sources"
109
openum "github.com/ethereum-optimism/optimism/op-service/enum"
1110
oplog "github.com/ethereum-optimism/optimism/op-service/log"
11+
"github.com/ethereum-optimism/optimism/op-service/sources"
1212

1313
"github.com/urfave/cli/v2"
1414
)

‎op-node/node/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"fmt"
77
"time"
88

9-
"github.com/ethereum-optimism/optimism/op-node/client"
109
"github.com/ethereum-optimism/optimism/op-node/rollup"
11-
"github.com/ethereum-optimism/optimism/op-node/sources"
10+
"github.com/ethereum-optimism/optimism/op-service/client"
11+
"github.com/ethereum-optimism/optimism/op-service/sources"
1212

1313
"github.com/ethereum/go-ethereum/log"
1414
gn "github.com/ethereum/go-ethereum/node"

‎op-node/node/node.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ import (
1616
"github.com/ethereum/go-ethereum/event"
1717
"github.com/ethereum/go-ethereum/log"
1818

19-
"github.com/ethereum-optimism/optimism/op-node/client"
2019
"github.com/ethereum-optimism/optimism/op-node/heartbeat"
2120
"github.com/ethereum-optimism/optimism/op-node/metrics"
2221
"github.com/ethereum-optimism/optimism/op-node/p2p"
2322
"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
24-
"github.com/ethereum-optimism/optimism/op-node/sources"
2523
"github.com/ethereum-optimism/optimism/op-node/version"
24+
"github.com/ethereum-optimism/optimism/op-service/client"
2625
"github.com/ethereum-optimism/optimism/op-service/eth"
2726
oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
2827
"github.com/ethereum-optimism/optimism/op-service/retry"
28+
"github.com/ethereum-optimism/optimism/op-service/sources"
2929
)
3030

3131
type OpNode struct {

‎op-node/node/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/ethereum-optimism/optimism/op-node/metrics"
1616
"github.com/ethereum-optimism/optimism/op-node/p2p"
1717
"github.com/ethereum-optimism/optimism/op-node/rollup"
18-
"github.com/ethereum-optimism/optimism/op-node/sources"
18+
"github.com/ethereum-optimism/optimism/op-service/sources"
1919
)
2020

2121
type rpcServer struct {

‎op-node/node/server_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ import (
1111
"github.com/stretchr/testify/mock"
1212
"github.com/stretchr/testify/require"
1313

14-
rpcclient "github.com/ethereum-optimism/optimism/op-node/client"
15-
1614
"github.com/ethereum/go-ethereum/core/types"
1715
"github.com/ethereum/go-ethereum/log"
1816

1917
"github.com/ethereum-optimism/optimism/op-node/metrics"
2018
"github.com/ethereum-optimism/optimism/op-node/rollup"
21-
"github.com/ethereum-optimism/optimism/op-node/testutils"
2219
"github.com/ethereum-optimism/optimism/op-node/version"
20+
rpcclient "github.com/ethereum-optimism/optimism/op-service/client"
2321
"github.com/ethereum-optimism/optimism/op-service/eth"
2422
"github.com/ethereum-optimism/optimism/op-service/testlog"
23+
"github.com/ethereum-optimism/optimism/op-service/testutils"
2524
)
2625

2726
func TestOutputAtBlock(t *testing.T) {

‎op-node/p2p/gossip_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
99
"github.com/ethereum-optimism/optimism/op-node/rollup"
10-
"github.com/ethereum-optimism/optimism/op-node/testutils"
10+
"github.com/ethereum-optimism/optimism/op-service/testutils"
1111
"github.com/ethereum/go-ethereum/common"
1212
"github.com/ethereum/go-ethereum/crypto"
1313

‎op-node/p2p/host_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525

2626
"github.com/ethereum-optimism/optimism/op-node/metrics"
2727
"github.com/ethereum-optimism/optimism/op-node/rollup"
28-
"github.com/ethereum-optimism/optimism/op-node/testutils"
2928
"github.com/ethereum-optimism/optimism/op-service/eth"
3029
"github.com/ethereum-optimism/optimism/op-service/testlog"
30+
"github.com/ethereum-optimism/optimism/op-service/testutils"
3131
)
3232

3333
func TestingConfig(t *testing.T) *Config {

‎op-node/rollup/derive/attributes_queue_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
1515
"github.com/ethereum-optimism/optimism/op-node/rollup"
16-
"github.com/ethereum-optimism/optimism/op-node/testutils"
1716
"github.com/ethereum-optimism/optimism/op-service/eth"
1817
"github.com/ethereum-optimism/optimism/op-service/testlog"
18+
"github.com/ethereum-optimism/optimism/op-service/testutils"
1919
)
2020

2121
// TestAttributesQueue checks that it properly uses the PreparePayloadAttributes function

‎op-node/rollup/derive/attributes_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515

1616
"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
1717
"github.com/ethereum-optimism/optimism/op-node/rollup"
18-
"github.com/ethereum-optimism/optimism/op-node/testutils"
1918
"github.com/ethereum-optimism/optimism/op-service/eth"
19+
"github.com/ethereum-optimism/optimism/op-service/testutils"
2020
)
2121

2222
func TestPreparePayloadAttributes(t *testing.T) {

0 commit comments

Comments
 (0)