Cargo.lock

@@ -3319,7 +3319,7 @@ dependencies = [
 
 [[package]]
 name = "tests-monero-serai"
-version = "0.0.0"
+version = "0.1.0"
 dependencies = [
  "futures",
  "hex",
@@ -3333,7 +3333,7 @@ dependencies = [
 
 [[package]]
 name = "tests-pow"
-version = "0.0.0"
+version = "0.1.0"
 dependencies = [
  "cuprate-consensus-rules",
  "cuprate-cryptonight",

Cargo.toml

@@ -163,7 +163,6 @@ pretty_assertions         = { version = "1" }
 proptest                  = { version = "1" }
 proptest-derive           = { version = "0.5" }
 tokio-test                = { version = "0.4" }
-reqwest                   = { version = "0.12" }
 
 ## TODO:
 ## Potential dependencies.

tests/monero-serai/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tests-monero-serai"
-version = "0.0.0"
+version = "0.1.0"
 edition = "2021"
 
 [dependencies]
@@ -9,7 +9,7 @@ hex          = { workspace = true, features = ["serde", "std"] }
 serde        = { workspace = true, features = ["derive"] }
 serde_json   = { workspace = true, features = ["std"] }
 tokio        = { workspace = true, features = ["full"] }
-reqwest      = { workspace = true, features = ["json"] }
+reqwest      = { version = "0.12", features = ["json"] }
 rayon        = { workspace = true }
 futures      = { workspace = true, features = ["std"] }
 

tests/monero-serai/src/main.rs

@@ -13,29 +13,14 @@ async fn main() {
     let now = Instant::now();
 
     let rpc_url = if let Ok(url) = std::env::var("RPC_URL") {
-        println!("RPC_URL (found): {url}");
         url
     } else {
-        let rpc_url = "http://127.0.0.1:18081".to_string();
+        "http://127.0.0.1:18081".to_string()
-        println!("RPC_URL (off, using default): {rpc_url}");
-        rpc_url
     };
-    if std::env::var("VERBOSE").is_ok() {
+    println!("rpc_url: {rpc_url}");
-        println!("VERBOSE: true");
-    } else {
-        println!("VERBOSE: false");
-    }
 
-    let mut client = rpc::RpcClient::new(rpc_url).await;
+    let client = rpc::RpcClient::new(rpc_url).await;
-
+    let top_height = client.top_height;
-    let top_height = if let Ok(Ok(h)) = std::env::var("TOP_HEIGHT").map(|s| s.parse()) {
-        client.top_height = h;
-        println!("TOP_HEIGHT (found): {h}");
-        h
-    } else {
-        println!("TOP_HEIGHT (off, using latest): {}", client.top_height);
-        client.top_height
-    };
 
     let ranges = (0..top_height)
         .collect::<Vec<usize>>()
@@ -43,17 +28,11 @@ async fn main() {
         .map(<[usize]>::to_vec)
         .collect::<Vec<Vec<usize>>>();
 
-    println!("ranges: [");
+    println!("ranges: ");
     for range in &ranges {
-        println!(
+        println!("[{}..{}]", range.first().unwrap(), range.last().unwrap());
-            "    ({}..{}),",
-            range.first().unwrap(),
-            range.last().unwrap()
-        );
     }
 
-    println!("]\n");
-
     let iter = ranges.into_iter().map(move |range| {
         let c = client.clone();
         async move {

tests/monero-serai/src/rpc.rs

@@ -81,6 +81,7 @@ impl RpcClient {
             .block_header
             .height;
 
+        println!("top_height: {top_height}");
         assert!(top_height > 3301441, "node is behind");
 
         Self {
@@ -255,17 +256,12 @@ impl RpcClient {
                 assert_eq!(reward, block_reward, "{info}");
                 assert_eq!(timestamp, block.header.timestamp, "{info}");
 
-                let progress = TESTED_BLOCK_COUNT.fetch_add(1, Ordering::Release) + 1;
+                let block_count = TESTED_BLOCK_COUNT.fetch_add(1, Ordering::Release) + 1;
                 let tx_count = TESTED_TX_COUNT.fetch_add(num_txes, Ordering::Release) + 1;
-
+                let percent = (block_count as f64 / top_height as f64) * 100.0;
-                if std::env::var("VERBOSE").is_err() && progress % 1000 != 0 {
-                    return;
-                }
-
-                let percent = (progress as f64 / top_height as f64) * 100.0;
 
                 println!(
-                    "progress        | {progress}/{top_height} ({percent:.2}%)
+                    "block_count     | {block_count}/{top_height} ({percent:.2}%)
 tx_count        | {tx_count}
 hash            | {}
 miner_tx_hash   | {}

tests/pow/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tests-pow"
-version = "0.0.0"
+version = "0.1.0"
 edition = "2021"
 
 [dependencies]
@@ -14,7 +14,7 @@ hex           = { workspace = true, features = ["serde", "std"] }
 serde         = { workspace = true, features = ["derive"] }
 serde_json    = { workspace = true, features = ["std"] }
 tokio         = { workspace = true, features = ["full"] }
-reqwest       = { workspace = true, features = ["json"] }
+reqwest       = { version = "0.12", features = ["json"] }
 rayon         = { workspace = true }
 randomx-rs    = { workspace = true }
 

tests/pow/src/main.rs

@@ -12,31 +12,14 @@ async fn main() {
     let now = Instant::now();
 
     let rpc_url = if let Ok(url) = std::env::var("RPC_URL") {
-        println!("RPC_URL (found): {url}");
         url
     } else {
-        let rpc_url = "http://127.0.0.1:18081".to_string();
+        "http://127.0.0.1:18081".to_string()
-        println!("RPC_URL (off, using default): {rpc_url}");
-        rpc_url
     };
-    if std::env::var("VERBOSE").is_ok() {
+    println!("rpc_url: {rpc_url}");
-        println!("VERBOSE: true");
-    } else {
-        println!("VERBOSE: false");
-    }
 
-    let mut client = rpc::RpcClient::new(rpc_url).await;
+    let client = rpc::RpcClient::new(rpc_url).await;
-
+    let top_height = client.top_height;
-    let top_height = if let Ok(Ok(h)) = std::env::var("TOP_HEIGHT").map(|s| s.parse()) {
-        client.top_height = h;
-        println!("TOP_HEIGHT (found): {h}");
-        h
-    } else {
-        println!("TOP_HEIGHT (off, using latest): {}", client.top_height);
-        client.top_height
-    };
-
-    println!();
 
     tokio::join!(
         client.cryptonight_v0(),

tests/pow/src/rpc.rs

@@ -66,7 +66,7 @@ impl RpcClient {
         });
 
         let top_height = client
-            .get(format!("{rpc_url}/json_rpc"))
+            .get(&rpc_url)
             .json(&request)
             .send()
             .await
@@ -85,6 +85,7 @@ impl RpcClient {
             .try_into()
             .unwrap();
 
+        println!("top_height: {top_height}");
         assert!(top_height > 3301441, "node is behind");
 
         Self {
@@ -102,9 +103,7 @@ impl RpcClient {
             "params": {"height": height, "fill_pow_hash": true}
         });
 
-        let rpc_url = format!("{}/json_rpc", self.rpc_url);
+        tokio::task::spawn(self.client.get(&self.rpc_url).json(&request).send())
-
-        tokio::task::spawn(self.client.get(rpc_url).json(&request).send())
             .await
             .unwrap()
             .unwrap()
@@ -170,18 +169,16 @@ impl RpcClient {
 
                 let count = TESTED_BLOCK_COUNT.fetch_add(1, Ordering::Release) + 1;
 
-                if std::env::var("VERBOSE").is_err() && count % 500 != 0 {
+                let hex_header = hex::encode(header.pow_hash);
-                    return;
+                let hex_hash = hex::encode(pow_hash);
-                }
-
-                let hash = hex::encode(pow_hash);
                 let percent = (count as f64 / top_height as f64) * 100.0;
 
                 println!(
                     "progress | {count}/{top_height} ({percent:.2}%)
 height   | {height}
 algo     | {name}
-hash     | {hash}\n"
+header   | {hex_header}
+hash     | {hex_hash}\n"
                 );
             });
         }