Skip to content

Commit 2f6cf8a

Browse files
committed
Remove benchmark code from debug code
1 parent 47870ac commit 2f6cf8a

File tree

8 files changed

+5
-314
lines changed

8 files changed

+5
-314
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ test-go-redis: test-go-deps
245245

246246
.PHONY: test-go-experimental
247247
test-go-experimental: test-go-deps
248-
.github/workflows/gotestsum.sh --timeout 120m --run TestExperimental --tags debugblock,benchsequencer --nolog
248+
.github/workflows/gotestsum.sh --timeout 120m --run TestExperimental --tags debugblock --nolog
249249
@printf $(done)
250250

251251
.PHONY: test-gen-proofs
@@ -362,7 +362,7 @@ $(output_root)/bin/transaction-filterer: $(DEP_PREDICATE) build-node-deps
362362

363363
# nitro built with experimental tooling enabled
364364
$(output_root)/bin/nitro-experimental: $(DEP_PREDICATE) build-node-deps
365-
go build $(GOLANG_PARAMS) --tags debugblock,benchsequencer -o $@ "$(CURDIR)/cmd/nitro"
365+
go build $(GOLANG_PARAMS) --tags debugblock -o $@ "$(CURDIR)/cmd/nitro"
366366

367367
# recompile wasm, but don't change timestamp unless files differ
368368
$(replay_wasm): $(DEP_PREDICATE) $(go_source) .make/solgen

cmd/util/confighelpers/configuration.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func devFlagArgs() []string {
209209
"--init.empty=false",
210210
"--http.port", "8547",
211211
"--http.addr", "127.0.0.1",
212-
"--http.api=net,web3,eth,arb,arbdebug,debug,benchseq",
212+
"--http.api=net,web3,eth,arb,arbdebug,debug",
213213
"--node.transaction-streamer.track-block-metadata-from=1",
214214
}
215215
return args

execution/gethexec/bench_sequencer.go

Lines changed: 0 additions & 90 deletions
This file was deleted.

execution/gethexec/bench_sequencer_config.go

Lines changed: 0 additions & 12 deletions
This file was deleted.

execution/gethexec/bench_sequencer_stub.go

Lines changed: 0 additions & 25 deletions
This file was deleted.

execution/gethexec/node.go

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -221,27 +221,21 @@ func LiveTracingConfigAddOptions(prefix string, f *pflag.FlagSet) {
221221
}
222222

223223
type DangerousConfig struct {
224-
DebugBlock debugblock.Config `koanf:"debug-block"`
225-
BenchSequencer BenchSequencerConfig `koanf:"bench-sequencer"`
224+
DebugBlock debugblock.Config `koanf:"debug-block"`
226225
}
227226

228227
var DefaultDangerousConfig = DangerousConfig{
229-
DebugBlock: debugblock.ConfigDefault,
230-
BenchSequencer: BenchSequencerConfigDefault,
228+
DebugBlock: debugblock.ConfigDefault,
231229
}
232230

233231
func DangerousConfigAddOptions(prefix string, f *pflag.FlagSet) {
234232
debugblock.ConfigAddOptions(prefix+".debug-block", f)
235-
BenchSequencerConfigAddOptions(prefix+".bench-sequencer", f)
236233
}
237234

238235
func (c *DangerousConfig) Validate() error {
239236
if err := c.DebugBlock.Validate(); err != nil {
240237
return err
241238
}
242-
if err := c.BenchSequencer.Validate(); err != nil {
243-
return err
244-
}
245239
return nil
246240
}
247241

@@ -340,17 +334,13 @@ func CreateExecutionNode(
340334
log.Warn("sequencer enabled without l1 client")
341335
}
342336

343-
var benchSequencerService interface{}
344337
if config.Sequencer.Enable {
345338
seqConfigFetcher := func() *SequencerConfig { return &configFetcher.Get().Sequencer }
346339
sequencer, err = NewSequencer(execEngine, parentChainReader, seqConfigFetcher, parentChainID)
347340
if err != nil {
348341
return nil, err
349342
}
350343
txPublisher = sequencer
351-
if config.Dangerous.BenchSequencer.Enable {
352-
txPublisher, benchSequencerService = NewBenchSequencer(sequencer)
353-
}
354344
} else {
355345
if config.Forwarder.RedisUrl != "" {
356346
txPublisher = NewRedisTxForwarder(config.forwardingTarget, &config.Forwarder)
@@ -481,14 +471,6 @@ func CreateExecutionNode(
481471
Authenticated: config.RPCServer.Authenticated,
482472
})
483473
}
484-
if benchSequencerService != nil {
485-
apis = append(apis, rpc.API{
486-
Namespace: "benchseq",
487-
Service: benchSequencerService,
488-
Public: false,
489-
})
490-
}
491-
492474
stack.RegisterAPIs(apis)
493475

494476
return execNode, nil

system_tests/bench_sequencer_stub_test.go

Lines changed: 0 additions & 66 deletions
This file was deleted.

system_tests/bench_sequencer_test.go

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)