fix rebase

src/main.rs

@@ -136,10 +136,8 @@ async fn main() -> Result<()> {
         Api::KuksaValV1
     };
 
-    if let Some(_) = args.buffer_size {
-        if matches!(api, Api::SdvDatabrokerV1 | Api::KuksaValV1) {
-            println!("Warning: buffer_size will be ignored, only supported for kuksa.val.v2 API");
-        }
+    if args.buffer_size.is_some() && matches!(api, Api::SdvDatabrokerV1 | Api::KuksaValV1) {
+        println!("Warning: buffer_size will be ignored, only supported for kuksa.val.v2 API");
     }
 
     let config_groups = read_config(args.test_data_file.as_ref())?;

src/measure.rs

@@ -111,18 +111,9 @@ async fn create_subscriber(
     initial_values_sender: Sender<HashMap<Signal, DataValue>>,
     buffer_size: Option<u32>,
 ) -> Result<Subscriber> {
-    let subscriber_channel = endpoint.connect().await.with_context(|| {
-        let host = endpoint.uri().host().unwrap_or("unknown host");
-        let port = endpoint
-            .uri()
-            .port()
-            .map_or("unknown port".to_string(), |p| p.to_string());
-        format!("Failed to connect to server {}:{}", host, port)
-    })?;
-
     if *api == Api::KuksaValV2 {
         let subscriber = s_kuksa_val_v2::Subscriber::new(
-            subscriber_channel,
+            channel,
             signals,
             initial_values_sender,
             buffer_size.unwrap_or(10),
@@ -133,17 +124,16 @@ async fn create_subscriber(
             subscriber_interface: Box::new(subscriber),
         })
     } else if *api == Api::SdvDatabrokerV1 {
-        let subscriber = s_sdv_databroker_v1::Subscriber::new(subscriber_channel, signals)
+        let subscriber = s_sdv_databroker_v1::Subscriber::new(channel, signals)
             .await
             .unwrap();
         Ok(Subscriber {
             subscriber_interface: Box::new(subscriber),
         })
     } else {
-        let subscriber =
-            s_kuksa_val_v1::Subscriber::new(subscriber_channel, signals, initial_values_sender)
-                .await
-                .unwrap();
+        let subscriber = s_kuksa_val_v1::Subscriber::new(channel, signals, initial_values_sender)
+            .await
+            .unwrap();
         Ok(Subscriber {
             subscriber_interface: Box::new(subscriber),
         })
@@ -258,7 +248,7 @@ pub async fn perform_measurement(
         let subscriber_channel = subscriber_channel.clone();
         let subscriber = create_subscriber(
             subscriber_channel,
-            signals,
+            signals.clone(),
             &measurement_config.api,
             initial_values_sender,
             measurement_config.buffer_size,