Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip LLO integration test that flakes #15311

Merged
merged 3 commits into from
Nov 20, 2024
Merged

Skip LLO integration test that flakes #15311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f44ab8f
Split out mercury servers to remove test interdependency
samsondav Nov 19, 2024
842df78
Disable the offending test
samsondav Nov 19, 2024
b34a6a8
Clean up loggin a tiny bit
samsondav Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/services/llo/mercurytransmitter/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 16 additions & 7 deletions core/services/ocr2/plugins/llo/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the t.Run(...) tests do not call t.Parallel() , so I am not sure how moving this to individual tests would help.

Would it make sense to keep this PR only about disabling tests and not modifying them?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because if a previous test fails it causes a subsequent test to fail for no good reason if you re-use the same server

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this makes total sense. In this case, would it be possible to put this stanza inside of startMercuryServer instead of duplicating it?

srv := NewMercuryServer(t, ed25519.PrivateKey(serverKey.Raw()), reqs)

clientCSAKeys := make([]csakey.KeyV2, nNodes)
clientPubKeys := make([]ed25519.PublicKey, nNodes)
for i := 0; i < nNodes; i++ {
Expand All @@ -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)
Expand Down Expand Up @@ -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[:])

Expand All @@ -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)
Expand Down
Loading