Skip to content

Commit

Permalink
chore(op-service): Remove reth receipts source (#11706)
Browse files Browse the repository at this point in the history
  • Loading branch information
clabby committed Sep 2, 2024
1 parent 9452aa6 commit 42085ce
Show file tree
Hide file tree
Showing 21 changed files with 3 additions and 5,802 deletions.
43 changes: 0 additions & 43 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1313,45 +1313,6 @@ jobs:
paths:
- "/go/pkg/mod"

op-service-rethdb-tests:
docker:
- image: <<pipeline.parameters.ci_builder_rust_image>>
steps:
- checkout
- check-changed:
patterns: op-service,op-node
- restore_cache:
name: Restore Go modules cache
key: gomod-{{ checksum "go.sum" }}
- run:
name: Cargo fmt + clippy
command: |
cargo +nightly fmt -- --check
cargo +nightly clippy --all --all-features -- -D warnings
working_directory: op-service/rethdb-reader
- run:
name: Generate testdata db
command: cargo test
working_directory: op-service/rethdb-reader
- run:
name: Build dylib
command: cargo build --release
working_directory: op-service/rethdb-reader
- run:
name: Update LD_LIBRARY_PATH
command: echo 'export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/root/project/op-service/rethdb-reader/target/release"' >> $BASH_ENV
- run:
name: Run op-service RethDB tests
command: |
gotestsum --format=standard-verbose --junitfile=/tmp/test-results/op-service.xml \
-- -parallel=8 -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out \
-run TestRethDB -tags rethdb -v
working_directory: op-service/sources
# TODO(CLI-148): Fix codecov
#- run:
#name: upload coverage
#command: codecov --verbose --clean --flags bedrock-rethdb-go-tests

bedrock-go-tests: # just a helper, that depends on all the actual test jobs
docker:
# Use a smaller base image to avoid pulling the huge ci-builder
Expand Down Expand Up @@ -1622,9 +1583,6 @@ workflows:
requires:
- pnpm-monorepo
- cannon-prestate
- op-service-rethdb-tests:
requires:
- go-mod-download
- op-program-compat:
requires:
- op-program-tests
Expand All @@ -1647,7 +1605,6 @@ workflows:
- op-program-compat
- op-service-tests
- op-supervisor-tests
- op-service-rethdb-tests
- op-e2e-HTTP-tests
- op-e2e-fault-proof-tests
- op-e2e-action-tests
Expand Down
8 changes: 0 additions & 8 deletions op-node/flags/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,6 @@ var (
}(),
Category: L1RPCCategory,
}
L1RethDBPath = &cli.StringFlag{
Name: "l1.rethdb",
Usage: "The L1 RethDB path, used to fetch receipts for L1 blocks.",
EnvVars: prefixEnvVars("L1_RETHDB"),
Hidden: true,
Category: L1RPCCategory,
}
L1RPCMaxConcurrency = &cli.IntFlag{
Name: "l1.max-concurrency",
Usage: "Maximum number of concurrent RPC requests to make to the L1 RPC provider.",
Expand Down Expand Up @@ -413,7 +406,6 @@ var optionalFlags = []cli.Flag{
HeartbeatURLFlag,
RollupHalt,
RollupLoadProtocolVersions,
L1RethDBPath,
ConductorEnabledFlag,
ConductorRpcFlag,
ConductorRpcTimeoutFlag,
Expand Down
3 changes: 0 additions & 3 deletions op-node/node/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ type Config struct {
// Cancel to request a premature shutdown of the node itself, e.g. when halting. This may be nil.
Cancel context.CancelCauseFunc

// [OPTIONAL] The reth DB path to read receipts from
RethDBPath string

// Conductor is used to determine this node is the leader sequencer.
ConductorEnabled bool
ConductorRpc string
Expand Down
3 changes: 0 additions & 3 deletions op-node/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,6 @@ func (n *OpNode) initL1(ctx context.Context, cfg *Config) error {
return fmt.Errorf("failed to get L1 RPC client: %w", err)
}

// Set the RethDB path in the EthClientConfig, if there is one configured.
rpcCfg.EthClientConfig.RethDBPath = cfg.RethDBPath

n.l1Source, err = sources.NewL1Client(
client.NewInstrumentedRPC(l1Node, &n.metrics.RPCMetrics.RPCClientMetrics), n.log, n.metrics.L1SourceCache, rpcCfg)
if err != nil {
Expand Down
1 change: 0 additions & 1 deletion op-node/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
SafeDBPath: ctx.String(flags.SafeDBPath.Name),
Sync: *syncConfig,
RollupHalt: haltOption,
RethDBPath: ctx.String(flags.L1RethDBPath.Name),

ConductorEnabled: ctx.Bool(flags.ConductorEnabledFlag.Name),
ConductorRpc: ctx.String(flags.ConductorRpcFlag.Name),
Expand Down
8 changes: 0 additions & 8 deletions op-service/rethdb-reader/.gitignore

This file was deleted.

Loading

0 comments on commit 42085ce

Please sign in to comment.