Split out mercury servers to remove test interdependency

smartcontractkit · Nov 19, 2024 · f44ab8f · f44ab8f
1 parent 1341a3a
commit f44ab8f
Showing 1 changed file with 10 additions and 5 deletions.
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)
@@ -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)