Skip LLO integration test that flakes (#15311)

* Split out mercury servers to remove test interdependency * Disable the offending test * Clean up loggin a tiny bit
smartcontractkit · Nov 20, 2024 · a9c9ddf · a9c9ddf
1 parent c67b180
commit a9c9ddf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/core/services/llo/mercurytransmitter/server.go b/core/services/llo/mercurytransmitter/server.go
@@ -195,7 +195,7 @@ func (s *server) runQueueLoop(stopCh services.StopChan, wg *sync.WaitGroup, donI
 			return
 		} else if err != nil {
 			s.transmitConnectionErrorCount.Inc()
-			s.lggr.Errorw("Transmit report failed", "err", err, "req", req, "transmission", t)
+			s.lggr.Errorw("Transmit report failed", "err", err, "req.Payload", req.Payload, "req.ReportFormat", req.ReportFormat, "transmission", t)
 			if ok := s.q.Push(t); !ok {
 				s.lggr.Error("Failed to push report to transmit queue; queue is closed")
 				return

diff --git a/core/services/ocr2/plugins/llo/integration_test.go b/core/services/ocr2/plugins/llo/integration_test.go
@@ -342,11 +342,6 @@ func TestIntegration_LLO(t *testing.T) {
 	multiplier := decimal.New(1, 18)
 	expirationWindow := time.Hour / time.Second
 
-	reqs := make(chan request, 100000)
-	serverKey := csakey.MustNewV2XXXTestingOnly(big.NewInt(-1))
-	serverPubKey := serverKey.PublicKey
-	srv := NewMercuryServer(t, ed25519.PrivateKey(serverKey.Raw()), reqs)
-
 	clientCSAKeys := make([]csakey.KeyV2, nNodes)
 	clientPubKeys := make([]ed25519.PublicKey, nNodes)
 	for i := 0; i < nNodes; i++ {
@@ -366,6 +361,11 @@ func TestIntegration_LLO(t *testing.T) {
 	bootstrapNode := Node{App: appBootstrap, KeyBundle: bootstrapKb}
 
 	t.Run("using legacy verifier configuration contract, produces reports in v0.3 format", func(t *testing.T) {
+		reqs := make(chan request, 100000)
+		serverKey := csakey.MustNewV2XXXTestingOnly(big.NewInt(-1))
+		serverPubKey := serverKey.PublicKey
+		srv := NewMercuryServer(t, ed25519.PrivateKey(serverKey.Raw()), reqs)
+
 		serverURL := startMercuryServer(t, srv, clientPubKeys)
 
 		donID := uint32(995544)
@@ -526,10 +526,14 @@ channelDefinitionsContractFromBlock = %d`, serverURL, serverPubKey, donID, confi
 				}
 
 				// test on-chain verification
-				{
+				t.Run("on-chain verification", func(t *testing.T) {
+					t.Skip("SKIP - MERC-6637")
+					// Disabled because it flakes, sometimes returns "execution reverted"
+					// No idea why
+					// https://smartcontract-it.atlassian.net/browse/MERC-6637
 					_, err = verifierProxy.Verify(steve, req.req.Payload, []byte{})
 					require.NoError(t, err)
-				}
+				})
 
 				t.Logf("oracle %x reported for 0x%x", req.pk[:], feedID[:])
 
@@ -546,6 +550,11 @@ channelDefinitionsContractFromBlock = %d`, serverURL, serverPubKey, donID, confi
 	})
 
 	t.Run("Blue/Green lifecycle (using JSON report format)", func(t *testing.T) {
+		reqs := make(chan request, 100000)
+		serverKey := csakey.MustNewV2XXXTestingOnly(big.NewInt(-2))
+		serverPubKey := serverKey.PublicKey
+		srv := NewMercuryServer(t, ed25519.PrivateKey(serverKey.Raw()), reqs)
+
 		serverURL := startMercuryServer(t, srv, clientPubKeys)
 
 		donID := uint32(888333)