op-batcher: apply code-review suggestions

Co-authored-by: Sebastian Stammler <seb@oplabs.co>

op-batcher/batcher/service.go

@@ -110,10 +110,6 @@ func (bs *BatcherService) initFromCLIConfig(ctx context.Context, version string,
 	if err := bs.initRPCServer(cfg); err != nil {
 		return fmt.Errorf("failed to start RPC server: %w", err)
 	}
-	// Validate the setup
-	if err := bs.Check(); err != nil {
-		return fmt.Errorf("failed post-initialization check: %w", err)
-	}
 
 	bs.Metrics.RecordInfo(bs.Version)
 	bs.Metrics.RecordUp()
@@ -260,12 +256,6 @@ func (bs *BatcherService) initRPCServer(cfg *CLIConfig) error {
 	return nil
 }
 
-// Check ensures that the [BatcherService] is valid
-func (bs *BatcherService) Check() error {
-
-	return nil
-}
-
 // Start runs once upon start of the batcher lifecycle,
 // and starts batch-submission work if the batcher is configured to start submit data on startup.
 func (bs *BatcherService) Start(_ context.Context) error {

op-e2e/system_fpp_test.go

@@ -93,7 +93,7 @@ func testVerifyL2OutputRootEmptyBlock(t *testing.T, detached bool) {
 	l2OutputRoot := agreedL2Output.OutputRoot
 
 	t.Log("=====Stopping batch submitter=====")
-	err = sys.BatchSubmitter.Driver().StopBatchSubmitting(context.Background())
+	err = sys.BatchSubmitter.Driver().StopBatchSubmitting(ctx)
 	require.NoError(t, err, "could not stop batch submitter")
 
 	// Wait for the sequencer to catch up with the current L1 head so we know all submitted batches are processed

op-service/clock/loop.go

@@ -39,8 +39,10 @@ func (lf *LoopFn) work() {
 			return
 		case <-lf.ticker.Ch():
 			ctx, cancel := context.WithCancel(lf.ctx)
-			lf.fn(ctx)
-			cancel()
+			func() {
+				defer cancel()
+				lf.fn(ctx)
+			}()
 		}
 	}
 }

op-service/clock/loop_test.go

@@ -23,5 +23,10 @@ func TestLoopFn(t *testing.T) {
 	<-calls
 	cl.AdvanceTime(time.Second * 10)
 	<-calls
+	select {
+	case <-calls:
+		t.Fatal("more calls than expected")
+	default:
+	}
 	require.ErrorIs(t, loopFn.Close(), testErr)
 }