bench-utils -> bench

Cargo.lock

@@ -444,15 +444,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "bench-utils"
+name = "bench"
 version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
+ "csv",
  "log",
  "serde",
  "solana-client",
  "solana-sdk",
+ "tokio",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -2253,13 +2256,12 @@ dependencies = [
  "actix-web",
  "anyhow",
  "base64 0.21.0",
- "bench-utils",
+ "bench",
  "bincode",
  "bs58",
  "bytes",
  "clap 4.0.32",
  "const_env",
- "csv",
  "dashmap",
  "futures",
  "jsonrpsee",

Cargo.toml

@@ -6,16 +6,11 @@ description = "A lite version of solana rpc to send and confirm transactions"
 
 [workspace]
 members = [
-    "bench-utils"
+    "bench"
 ]
 
-[[bench]]
-name="tps"
-harness=false
-
 [dev-dependencies]
-bench-utils = { path = "./bench-utils" }
+bench = { path = "./bench" }
-csv = "1.1.6"
 
 [dependencies]
 solana-client = "1.14.12"

bench/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "bench-utils"
+name = "bench"
 version = "0.1.0"
 edition = "2021"
 
@@ -9,4 +9,7 @@ solana-sdk = "1.14.12"
 log = "0.4.17"
 anyhow = "1.0.68"
 serde = "1.0.152"
+csv = "1.1.6"
 clap = { version = "4.0.32", features = ["derive"] }
+tokio = { version = "1.24.1", features = ["full"]} 
+tracing-subscriber = "0.3.16"

bench/src/main.rs

@@ -4,13 +4,13 @@ use std::{
     time::{Duration, Instant},
 };
 
-use bench_utils::{
+use bench::{
     cli::Args,
     helpers::BenchHelper,
     metrics::{AvgMetric, Metric},
 };
 use clap::Parser;
-use lite_rpc::DEFAULT_LITE_RPC_ADDR;
+//use lite_rpc::DEFAULT_LITE_RPC_ADDR;
 use log::info;
 use solana_client::{nonblocking::rpc_client::RpcClient, rpc_client::SerializableTransaction};
 use solana_sdk::{

tests/client.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use bench_utils::helpers::BenchHelper;
+use bench::helpers::BenchHelper;
 use lite_rpc::DEFAULT_LITE_RPC_ADDR;
 use log::info;
 use solana_client::{nonblocking::rpc_client::RpcClient, rpc_client::SerializableTransaction};

tests/workers.rs

@@ -1,7 +1,6 @@
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
-use std::time::Duration;
 
-use bench_utils::helpers::BenchHelper;
+use bench::helpers::BenchHelper;
 use futures::future::try_join_all;
 use lite_rpc::{
     encoding::BinaryEncoding,