Expose run_tests & run_tests (#10)

deanrock · web-flow · commit ae0bc4156773 · 2023-09-11T13:28:55.000+02:00
* Publicly expose Measurement fields

* Publicly expose run_tests and PayloadSize::sizes_from_max

* bump to version 1.1.1 and upgrade deps
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cfspeedtest"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 license = "MIT"
 description = "Unofficial CLI for speed.cloudflare.com"
diff --git a/src/measurements.rs b/src/measurements.rs
@@ -19,9 +19,9 @@ struct StatMeasurement {
 
 #[derive(Serialize)]
 pub struct Measurement {
-    pub(crate) test_type: TestType,
-    pub(crate) payload_size: usize,
-    pub(crate) mbit: f64,
+    pub test_type: TestType,
+    pub payload_size: usize,
+    pub mbit: f64,
 }
 
 impl Display for Measurement {
diff --git a/src/speedtest.rs b/src/speedtest.rs
@@ -50,7 +50,7 @@ impl PayloadSize {
         }
     }
 
-    fn sizes_from_max(max_payload_size: PayloadSize) -> Vec<usize> {
+    pub fn sizes_from_max(max_payload_size: PayloadSize) -> Vec<usize> {
         log::debug!("getting payload iterations for max_payload_size {max_payload_size:?}");
         let payload_bytes: Vec<usize> =
             vec![100_000, 1_000_000, 10_000_000, 25_000_000, 100_000_000];
@@ -170,7 +170,7 @@ pub fn test_latency(client: &Client) -> f64 {
     req_latency
 }
 
-fn run_tests(
+pub fn run_tests(
     client: &Client,
     test_fn: fn(&Client, usize, OutputFormat) -> f64,
     test_type: TestType,

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ impl PayloadSize {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- fn sizes_from_max(max_payload_size: PayloadSize) -> Vec<usize> {`
	`53`	`+ pub fn sizes_from_max(max_payload_size: PayloadSize) -> Vec<usize> {`
`54`	`54`	`log::debug!("getting payload iterations for max_payload_size {max_payload_size:?}");`
`55`	`55`	`let payload_bytes: Vec<usize> =`
`56`	`56`	`vec![100_000, 1_000_000, 10_000_000, 25_000_000, 100_000_000];`
`@@ -170,7 +170,7 @@ pub fn test_latency(client: &Client) -> f64 {`
`170`	`170`	`req_latency`
`171`	`171`	`}`
`172`	`172`
`173`		`-fn run_tests(`
	`173`	`+pub fn run_tests(`
`174`	`174`	`client: &Client,`
`175`	`175`	`test_fn: fn(&Client, usize, OutputFormat) -> f64,`
`176`	`176`	`test_type: TestType,`