Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/bin/testrpc.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down Expand Up @@ -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 {
Expand Down
25 changes: 14 additions & 11 deletions src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down