op-e2e: Try to make TestELSync more stable (#9370)

op-e2e/actions/l2_engine.go

@@ -142,6 +142,10 @@ func (s *L2Engine) AddPeers(peers ...*enode.Node) {
 	}
 }
 
+func (s *L2Engine) PeerCount() int {
+	return s.node.Server().PeerCount()
+}
+
 func (s *L2Engine) EthClient() *ethclient.Client {
 	cl := s.node.Attach()
 	return ethclient.NewClient(cl)

op-e2e/actions/sync_test.go

@@ -174,9 +174,6 @@ func TestELSync(gt *testing.T) {
 	// Enable engine P2P sync
 	verEng, verifier := setupVerifier(t, sd, log, miner.L1Client(t, sd.RollupCfg), miner.BlobStore(), &sync.Config{SyncMode: sync.ELSync})
 
-	seqEng.AddPeers(verEng.Enode())
-	verEng.AddPeers(seqEng.Enode())
-
 	seqEngCl, err := sources.NewEngineClient(seqEng.RPCClient(), log, nil, sources.EngineClientDefaultConfig(sd.RollupCfg))
 	require.NoError(t, err)
 
@@ -189,6 +186,10 @@ func TestELSync(gt *testing.T) {
 		sequencer.ActL2EndBlock(t)
 	}
 
+	// Wait longer to peer. This tests flakes or takes a long time when the op-geth instances are not able to peer.
+	seqEng.AddPeers(verEng.Enode())
+	verEng.AddPeers(seqEng.Enode())
+
 	// Insert it on the verifier
 	seqHead, err := seqEngCl.PayloadByLabel(t.Ctx(), eth.Unsafe)
 	require.NoError(t, err)
@@ -196,6 +197,14 @@ func TestELSync(gt *testing.T) {
 	require.NoError(t, err)
 	verifier.ActL2InsertUnsafePayload(seqHead)(t)
 
+	require.Eventually(t,
+		func() bool {
+			return seqEng.PeerCount() > 0 && verEng.PeerCount() > 0
+		},
+		60*time.Second, 1500*time.Millisecond,
+		"Sequencer & Verifier must peer with each other for snap sync to work",
+	)
+
 	// Expect snap sync to download & execute the entire chain
 	// Verify this by checking that the verifier has the correct value for block 1
 	require.Eventually(t,
@@ -207,6 +216,7 @@ func TestELSync(gt *testing.T) {
 			return seqStart.ExecutionPayload.BlockHash == block.Hash
 		},
 		60*time.Second, 1500*time.Millisecond,
+		"verifier did not snap sync",
 	)
 }
 

op-program/client/l2/engineapi/l2_engine_api.go

@@ -350,7 +350,7 @@ func (ea *L2EngineAPI) forkchoiceUpdated(ctx context.Context, state *eth.Forkcho
 			return STATUS_SYNCING, nil
 		}
 
-		ea.log.Info("Forkchoice requested sync to new head", "number", header.Number, "hash", header.Hash())
+		ea.log.Info("Forkchoice requested sync to new head", "number", header.Number(), "hash", header.Hash())
 		if err := ea.downloader.BeaconSync(downloader.SnapSync, header.Header(), nil); err != nil {
 			return STATUS_SYNCING, err
 		}