Use ConnectParams in start_jds

stratum-mining · Feb 10, 2025 · 55bff2e · 55bff2e
1 parent 9b2490f
commit 55bff2e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 25 deletions.
diff --git a/roles/tests-integration/lib/mod.rs b/roles/tests-integration/lib/mod.rs
@@ -1,4 +1,5 @@
 use crate::{sniffer::*, template_provider::*};
+use corepc_node::{ConnectParams, CookieValues};
 use jd_client::JobDeclaratorClient;
 use jd_server::JobDeclaratorServer;
 use key_utils::{Secp256k1PublicKey, Secp256k1SecretKey};
@@ -155,7 +156,7 @@ pub async fn start_jdc(
     (ret, jdc_address)
 }
 
-pub async fn start_jds(tp_address: SocketAddr) -> (JobDeclaratorServer, SocketAddr) {
+pub async fn start_jds(tp_rpc_connection: &ConnectParams) -> (JobDeclaratorServer, SocketAddr) {
     use jd_server::{CoinbaseOutput, Configuration, CoreRpc};
     let authority_public_key = Secp256k1PublicKey::try_from(
         "9auqWEzQDVyd2oe1JVGFLMLHZtCo2FFqZwtKA5gd9xbuEu7PH72".to_string(),
@@ -171,28 +172,32 @@ pub async fn start_jds(tp_address: SocketAddr) -> (JobDeclaratorServer, SocketAd
         "P2WPKH".to_string(),
         "036adc3bdf21e6f9a0f0fb0066bf517e5b7909ed1563d6958a10993849a7554075".to_string(),
     )];
-    let core_rpc = CoreRpc::new(
-        tp_address.ip().to_string(),
-        tp_address.port(),
-        "tp_username".to_string(),
-        "tp_password".to_string(),
-    );
-    let config = Configuration::new(
-        listen_jd_address.to_string(),
-        authority_public_key,
-        authority_secret_key,
-        cert_validity_sec,
-        coinbase_outputs,
-        core_rpc,
-        std::time::Duration::from_secs(1),
-    );
-    let job_declarator_server = JobDeclaratorServer::new(config).unwrap();
-    let job_declarator_server_clone = job_declarator_server.clone();
-    tokio::spawn(async move {
-        let _ = job_declarator_server_clone.start().await;
-    });
-    tokio::time::sleep(std::time::Duration::from_secs(2)).await;
-    (job_declarator_server, listen_jd_address)
+    if let Ok(Some(CookieValues { user, password })) = tp_rpc_connection.get_cookie_values() {
+        let core_rpc = CoreRpc::new(
+            format!("http://{}", tp_rpc_connection.rpc_socket.ip()).to_string(),
+            tp_rpc_connection.rpc_socket.port(),
+            user,
+            password,
+        );
+        let config = Configuration::new(
+            listen_jd_address.to_string(),
+            authority_public_key,
+            authority_secret_key,
+            cert_validity_sec,
+            coinbase_outputs,
+            core_rpc,
+            std::time::Duration::from_secs(1),
+        );
+        let job_declarator_server = JobDeclaratorServer::new(config).unwrap();
+        let job_declarator_server_clone = job_declarator_server.clone();
+        tokio::spawn(async move {
+            job_declarator_server_clone.start().await.unwrap();
+        });
+        tokio::time::sleep(std::time::Duration::from_secs(2)).await;
+        (job_declarator_server, listen_jd_address)
+    } else {
+        panic!("Failed to get TP cookie values");
+    }
 }
 
 pub async fn start_sv2_translator(upstream: SocketAddr) -> (TranslatorSv2, SocketAddr) {

diff --git a/roles/tests-integration/tests/jd_integration.rs b/roles/tests-integration/tests/jd_integration.rs
@@ -24,9 +24,9 @@ use roles_logic_sv2::parsers::{CommonMessages, PoolMessages};
 //   internal cleanup or reconnection attempts.
 #[tokio::test]
 async fn jds_should_not_panic_if_jdc_shutsdown() {
-    let (_tp, tp_addr) = start_template_provider(None).await;
+    let (tp, tp_addr) = start_template_provider(None).await;
     let (_pool, pool_addr) = start_pool(Some(tp_addr)).await;
-    let (_jds, jds_addr) = start_jds(tp_addr).await;
+    let (_jds, jds_addr) = start_jds(tp.rpc_info()).await;
     let (jdc, jdc_addr) = start_jdc(pool_addr, tp_addr, jds_addr).await;
     jdc.shutdown();
     tokio::time::sleep(std::time::Duration::from_secs(1)).await;