This commit is contained in:
hinto.janai 2024-12-12 19:52:55 -05:00
parent 7cd3254477
commit 8acb166639
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
5 changed files with 12 additions and 11 deletions

View file

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

View file

@ -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 = { version = "0.12", features = ["json"] }
reqwest = { workspace = true, features = ["json"] }
rayon = { workspace = true }
futures = { workspace = true, features = ["std"] }

View file

@ -256,12 +256,12 @@ impl RpcClient {
assert_eq!(reward, block_reward, "{info}");
assert_eq!(timestamp, block.header.timestamp, "{info}");
let block_count = TESTED_BLOCK_COUNT.fetch_add(1, Ordering::Release) + 1;
let progress = 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;
let percent = (progress as f64 / top_height as f64) * 100.0;
println!(
"block_count | {block_count}/{top_height} ({percent:.2}%)
"progress | {progress}/{top_height} ({percent:.2}%)
tx_count | {tx_count}
hash | {}
miner_tx_hash | {}

View file

@ -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 = { version = "0.12", features = ["json"] }
reqwest = { workspace = true, features = ["json"] }
rayon = { workspace = true }
randomx-rs = { workspace = true }

View file

@ -66,7 +66,7 @@ impl RpcClient {
});
let top_height = client
.get(&rpc_url)
.get(format!("{rpc_url}/json_rpc"))
.json(&request)
.send()
.await
@ -103,7 +103,9 @@ impl RpcClient {
"params": {"height": height, "fill_pow_hash": true}
});
tokio::task::spawn(self.client.get(&self.rpc_url).json(&request).send())
let rpc_url = format!("{}/json_rpc", self.rpc_url);
tokio::task::spawn(self.client.get(rpc_url).json(&request).send())
.await
.unwrap()
.unwrap()
@ -169,16 +171,14 @@ impl RpcClient {
let count = TESTED_BLOCK_COUNT.fetch_add(1, Ordering::Release) + 1;
let hex_header = hex::encode(header.pow_hash);
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}
header | {hex_header}
hash | {hex_hash}\n"
hash | {hash}\n"
);
});
}