feat: update println! and eprintln! to info using tracing cargo.

stratum-mining · Dec 19, 2024 · 0b30d0e · 0b30d0e
1 parent 22da418
commit 0b30d0e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/roles/Cargo.lock b/roles/Cargo.lock
diff --git a/roles/test-utils/mining-device-sv1/Cargo.toml b/roles/test-utils/mining-device-sv1/Cargo.toml
@@ -27,3 +27,5 @@ serde_json = { version = "1.0.64", default-features = false, features = ["alloc"
 v1 = { path="../../../protocols/v1", package="sv1_api" }
 num-bigint = "0.4.3"
 num-traits = "0.2.15"
+tracing = "0.1.41"
+tracing-subscriber = "0.3.19"
diff --git a/roles/test-utils/mining-device-sv1/src/client.rs b/roles/test-utils/mining-device-sv1/src/client.rs
@@ -7,6 +7,7 @@ use num_bigint::BigUint;
 use num_traits::FromPrimitive;
 use roles_logic_sv2::utils::Mutex;
 use std::{sync::Arc, time};
+use tracing::info;
 
 use stratum_common::bitcoin::util::uint::Uint256;
 use v1::{
@@ -105,17 +106,17 @@ impl Client {
                 match message {
                     Ok(msg) => {
                         if let Err(e) = sender_incoming.send(msg).await {
-                            eprintln!("Failed to send message to receiver_incoming: {:?}", e);
+                            info!("Failed to send message to receiver_incoming: {:?}", e);
                             break; // Exit the loop if sending fails
                         }
                     }
                     Err(e) => {
-                        eprintln!("Error reading from socket: {:?}", e);
+                        info!("Error reading from socket: {:?}", e);
                         break; // Exit the loop on read failure
                     }
                 }
             }
-            eprintln!("Reader task terminated.");
+            info!("Reader task terminated.");
         });
 
         // Waits to receive a message from `sender_outgoing` and writes it to the socket for the
@@ -234,7 +235,7 @@ impl Client {
     ) {
         // If we have a line (1 line represents 1 sv1 incoming message), then handle that message
         if let Ok(line) = incoming_message {
-            println!(
+            info!(
                 "CLIENT {} - Received: {}",
                 self_.safe_lock(|s| s.client_id).unwrap(),
                 line
@@ -254,7 +255,7 @@ impl Client {
     /// Send SV1 messages to the receiver_outgoing which writes to the socket (aka Upstream node)
     async fn send_message(sender: Sender<String>, msg: json_rpc::Message) {
         let msg = format!("{}\n", serde_json::to_string(&msg).unwrap());
-        println!(" - Send: {}", &msg);
+        info!(" - Send: {}", &msg);
         sender.send(msg).await.unwrap();
     }
 

diff --git a/roles/test-utils/mining-device-sv1/src/main.rs b/roles/test-utils/mining-device-sv1/src/main.rs
@@ -7,6 +7,8 @@ pub(crate) use client::Client;
 
 #[async_std::main]
 async fn main() {
+    tracing_subscriber::fmt().init();
+
     const ADDR: &str = "127.0.0.1:34255";
     Client::connect(
         80,

diff --git a/roles/test-utils/mining-device-sv1/src/miner.rs b/roles/test-utils/mining-device-sv1/src/miner.rs
@@ -1,4 +1,5 @@
 use crate::job::Job;
+use tracing::info;
 use std::convert::TryInto;
 use stratum_common::bitcoin::{
     blockdata::block::BlockHeader,
@@ -75,7 +76,7 @@ impl Miner {
         hash.reverse();
         let hash = Uint256::from_be_bytes(hash);
         if hash < *self.target.as_ref().ok_or(())? {
-            println!(
+            info!(
                 "Found share with nonce: {}, for target: {:?}, hash: {:?}",
                 header.nonce, self.target, hash
             );