Fix batcher restart test (#222)

* Fix batcher restart test

* Tune parameters to be more realistic (in particular, increasing
  parallelism to reduce bottleneck on slow L1)
* Improve logging

* Fix go lint

Author: jbearer

espresso/devnet-tests/batcher_restart_test.go

@@ -13,7 +13,7 @@ func TestBatcherRestart(t *testing.T) {
 	defer cancel()
 
 	d := NewDevnet(ctx, t)
-	require.NoError(t, d.Up())
+	require.NoError(t, d.Up(testing.Verbose()))
 	defer func() {
 		require.NoError(t, d.Down())
 	}()

espresso/devnet-tests/devnet_tools.go

@@ -65,7 +65,7 @@ func NewDevnet(ctx context.Context, t *testing.T) *Devnet {
 	return d
 }
 
-func (d *Devnet) Up() (err error) {
+func (d *Devnet) Up(verbose bool) (err error) {
 	cmd := exec.CommandContext(
 		d.ctx,
 		"docker", "compose", "up", "-d",
@@ -95,6 +95,18 @@ func (d *Devnet) Up() (err error) {
 		}
 	}()
 
+	if verbose {
+		// Stream logs to stdout while the test runs. This goroutine will automatically exit when
+		// the context is cancelled.
+		go func() {
+			cmd = exec.CommandContext(d.ctx, "docker", "compose", "logs", "-f")
+			cmd.Stdout = os.Stdout
+			// We don't care about the error return of this command, since it's always going to be
+			// killed by the context cancellation.
+			_ = cmd.Run()
+		}()
+	}
+
 	// Open RPC clients for the different nodes.
 	d.L2Seq, err = d.serviceClient("op-geth-sequencer", 8546)
 	if err != nil {
@@ -196,6 +208,8 @@ func (d *Devnet) SubmitL2Tx(applyTxOpts helpers.TxOptsFn) (*types.Receipt, error
 		return nil, fmt.Errorf("wrong status: have %d, want %d", receipt.Status, opts.ExpectedStatus)
 	}
 
+	log.Info("submitted transaction to sequencer", "hash", tx.Hash(), "receipt", receipt)
+
 	return receipt, nil
 }
 

espresso/docker-compose.yml

@@ -311,8 +311,11 @@ services:
       - --mnemonic=test test test test test test test test test test test junk # Arbitrary value for testing
       - --hd-path=m/44'/60'/0'/0/0 # Arbitrary value for testing
       - --throttle-threshold=0
-      - --max-channel-duration=1
+      - --max-channel-duration=2
       - --target-num-frames=1
+      - --max-pending-tx=32
+      - --altda.max-concurrent-da-requests=32
+      - --espresso-poll-interval=1s
 
   # HTTP proxy for enclave Odyn proxy requirement
   http-proxy:

espresso/streamer.go

@@ -124,6 +124,7 @@ func NewEspressoStreamer[B Batch](
 
 // Reset the state to the last safe batch
 func (s *EspressoStreamer[B]) Reset() {
+	s.Log.Info("reset espresso streamer", "hotshot pos", s.fallbackHotShotPos, "batch pos", s.fallbackBatchPos)
 	s.hotShotPos = s.fallbackHotShotPos
 	s.BatchPos = s.fallbackBatchPos + 1
 	s.BatchBuffer.Clear()

op-batcher/batcher/driver.go

@@ -984,6 +984,7 @@ func (l *BatchSubmitter) sendTx(txdata txData, isCancel bool, candidate *txmgr.T
 			},
 		)
 		if !goroutineSpawned {
+			log.Warn("failed to spawn Espresso tx goroutine")
 			l.recordFailedDARequest(txdata.ID(), nil)
 		}
 		return

op-batcher/batcher/espresso.go

@@ -736,7 +736,7 @@ func (c *AdaptL1BlockRefClient) HeaderHashByNumber(ctx context.Context, number *
 
 // Periodically refreshes the sync status and polls Espresso streamer for new batches
 func (l *BatchSubmitter) espressoBatchLoadingLoop(ctx context.Context, wg *sync.WaitGroup, publishSignal chan struct{}) {
-	l.Log.Info("Starting EspressoBatchLoadingLoop")
+	l.Log.Info("Starting EspressoBatchLoadingLoop", "polling interval", l.Config.EspressoPollInterval)
 
 	defer wg.Done()
 	ticker := time.NewTicker(l.Config.EspressoPollInterval)