From f44ab8f904b0f8ae68460f2027fe71f3b920dc6f Mon Sep 17 00:00:00 2001 From: Sam Davies Date: Tue, 19 Nov 2024 13:41:25 -0500 Subject: [PATCH] Split out mercury servers to remove test interdependency --- .../services/ocr2/plugins/llo/integration_test.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/core/services/ocr2/plugins/llo/integration_test.go b/core/services/ocr2/plugins/llo/integration_test.go index 043ce34c946..568b6f73b34 100644 --- 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) @@ -546,6 +546,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)