From 5bf68565a63d87ff3683fd026565b7336dac3280 Mon Sep 17 00:00:00 2001
From: amirylm <83904651+amirylm@users.noreply.github.com>
Date: Tue, 16 Sep 2025 15:52:07 +0300
Subject: [PATCH] ping endpoint separately

---
 src/bin/testrpc.rs | 11 ++++++++++-
 src/runner.rs      | 25 ++++++++++++++-----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/bin/testrpc.rs b/src/bin/testrpc.rs
index 780de16..2f7c749 100644
--- a/src/bin/testrpc.rs
+++ b/src/bin/testrpc.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use std::{env, sync::Arc};
+use std::{env, sync::Arc, time::Duration};
 
 use testrpc::{common, config, ctx, logging, runner, signal};
 
@@ -72,6 +72,15 @@ async fn main() -> Result<(), common::TestrpcError> {
         urls
     };
 
+    runner::ping_endpoints(
+        cfg.adapter.clone(),
+        rpc_urls.clone(),
+        cfg.timeout
+            .or(Some(15))
+            .map(|t| Duration::from_secs(t as u64)),
+    )
+    .await?;
+
     if let Some(num_of_nodes) = cfg.num_of_nodes {
         let actual_num_of_nodes = rpc_urls.len();
         if actual_num_of_nodes != num_of_nodes {
diff --git a/src/runner.rs b/src/runner.rs
index 020a669..6412df9 100644
--- a/src/runner.rs
+++ b/src/runner.rs
@@ -14,17 +14,23 @@ pub async fn load_endpoints(cfg: config::Config) -> Result<Vec<String>, TestrpcE
         return Ok(rpcs);
     }
     let adapter = adapters::new_adapter(cfg.adapter)?;
-    let endpoints = adapter
+    adapter
         .load_endpoints(cfg.args.clone())
         .await
-        .map_err(|e| TestrpcError::LoadEndpointsError(e.to_string()))?;
-    // for each endpoint call adapter.ping_endpoint to check if it's reachable
+        .map_err(|e| TestrpcError::LoadEndpointsError(e.to_string()))
+}
+
+pub async fn ping_endpoints(
+    adapter_cfg: AdapterConfig,
+    rpc_urls: Vec<String>,
+    timeout: Option<std::time::Duration>,
+) -> Result<usize, TestrpcError> {
+    let adapter = adapters::new_adapter(adapter_cfg)?;
     let reachable_endpoints = Arc::new(atomic::AtomicUsize::new(0));
     let mut handles = Vec::new();
-    for endpoint in endpoints.clone() {
+    for endpoint in rpc_urls.clone() {
         let adapter = adapter.clone();
         let endpoint_clone = endpoint.clone();
-        let timeout = cfg.timeout.map(|t| Duration::from_secs(t as u64));
         let reachable_endpoints = Arc::clone(&reachable_endpoints);
         let handle = tokio::spawn(async move {
             let res = adapter.ping_endpoint(&endpoint_clone, timeout).await;
@@ -37,12 +43,9 @@ pub async fn load_endpoints(cfg: config::Config) -> Result<Vec<String>, TestrpcE
         handles.push(handle);
     }
     join_all(handles).await;
-    tracing::info!(
-        "Loaded {} endpoints, {} live",
-        endpoints.len(),
-        reachable_endpoints.load(atomic::Ordering::SeqCst)
-    );
-    Ok(endpoints)
+    let live_count = reachable_endpoints.load(atomic::Ordering::SeqCst);
+    tracing::info!("Pinged {} endpoints, {} live", rpc_urls.len(), live_count);
+    Ok(live_count)
 }
 
 /// Run the test flow with the given configuration.