config change

veilid-core/src/tests/common/test_crypto.rs

@@ -6,22 +6,10 @@ use crate::*;
 
 static LOREM_IPSUM:&[u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. ";
 
-fn setup_veilid_core() -> VeilidCoreSetup {
-    VeilidCoreSetup {
-        update_callback: Arc::new(
-            move |veilid_update: VeilidUpdate| -> SystemPinBoxFuture<()> {
-                Box::pin(async move {
-                    trace!("update_callback: {:?}", veilid_update);
-                })
-            },
-        ),
-        config_callback: Arc::new(config_callback),
-    }
-}
-
 async fn startup() -> VeilidAPI {
     trace!("test_table_store: starting");
-    let api = api_startup(setup_veilid_core())
+    let (update_callback, config_callback) = setup_veilid_core();
+    let api = api_startup(update_callback, config_callback)
         .await
         .expect("startup failed");
     api

veilid-core/src/tests/common/test_envelope_receipt.rs

@@ -8,7 +8,8 @@ use crate::*;
 
 pub async fn test_envelope_round_trip() {
     info!("--- test envelope round trip ---");
-    let api = api_startup(setup_veilid_core())
+    let (update_callback, config_callback) = setup_veilid_core();
+    let api = api_startup(update_callback, config_callback)
         .await
         .expect("startup failed");
 

veilid-core/src/tests/common/test_protected_store.rs

@@ -3,22 +3,10 @@ use crate::intf::*;
 use crate::xx::*;
 use crate::*;
 
-fn setup_veilid_core() -> VeilidCoreSetup {
-    VeilidCoreSetup {
-        update_callback: Arc::new(
-            move |veilid_update: VeilidUpdate| -> SystemPinBoxFuture<()> {
-                Box::pin(async move {
-                    trace!("update_callback: {:?}", veilid_update);
-                })
-            },
-        ),
-        config_callback: Arc::new(config_callback),
-    }
-}
-
 async fn startup() -> VeilidAPI {
     trace!("test_table_store: starting");
-    api_startup(setup_veilid_core())
+    let (update_callback, config_callback) = setup_veilid_core();
+    api_startup(update_callback, config_callback)
         .await
         .expect("startup failed")
 }

veilid-core/src/tests/common/test_table_store.rs

@@ -4,22 +4,10 @@ use crate::intf::*;
 use crate::xx::*;
 use crate::*;
 
-fn setup_veilid_core() -> VeilidCoreSetup {
-    VeilidCoreSetup {
-        update_callback: Arc::new(
-            move |veilid_update: VeilidUpdate| -> SystemPinBoxFuture<()> {
-                Box::pin(async move {
-                    trace!("update_callback: {:?}", veilid_update);
-                })
-            },
-        ),
-        config_callback: Arc::new(config_callback),
-    }
-}
-
 async fn startup() -> VeilidAPI {
     trace!("test_table_store: starting");
-    api_startup(setup_veilid_core())
+    let (update_callback, config_callback) = setup_veilid_core();
+    api_startup(update_callback, config_callback)
         .await
         .expect("startup failed")
 }

veilid-core/src/tests/common/test_veilid_config.rs

@@ -158,20 +158,20 @@ cfg_if! {
     }
 }
 
-pub fn setup_veilid_core() -> VeilidCoreSetup {
-    VeilidCoreSetup {
-        update_callback: Arc::new(
+pub fn setup_veilid_core() -> (UpdateCallback, ConfigCallback) {
+    (
+        Arc::new(
             move |veilid_update: VeilidUpdate| -> SystemPinBoxFuture<()> {
                 Box::pin(async move {
                     trace!("update_callback: {:?}", veilid_update);
                 })
             },
         ),
-        config_callback: Arc::new(config_callback),
-    }
+        Arc::new(config_callback),
+    )
 }
 
-pub fn config_callback(key: String) -> ConfigCallbackReturn {
+fn config_callback(key: String) -> ConfigCallbackReturn {
     match key.as_str() {
         "program_name" => Ok(Box::new(String::from("Veilid"))),
         "namespace" => Ok(Box::new(String::from(""))),

veilid-core/src/tests/common/test_veilid_core.rs

@@ -4,7 +4,8 @@ use crate::*;
 
 pub async fn test_startup_shutdown() {
     trace!("test_startup_shutdown: starting");
-    let api = api_startup(setup_veilid_core())
+    let (update_callback, config_callback) = setup_veilid_core();
+    let api = api_startup(update_callback, config_callback)
         .await
         .expect("startup failed");
     trace!("test_startup_shutdown: shutting down");
@@ -14,19 +15,26 @@ pub async fn test_startup_shutdown() {
 
 pub async fn test_attach_detach() {
     info!("--- test normal order ---");
-    let api = api_startup(setup_veilid_core())
+    let (update_callback, config_callback) = setup_veilid_core();
+    let api = api_startup(update_callback, config_callback)
         .await
         .expect("startup failed");
     api.attach().await.unwrap();
     intf::sleep(5000).await;
     api.detach().await.unwrap();
-    api.wait_for_update(VeilidUpdate::Attachment(AttachmentState::Detached), None)
-        .await
-        .unwrap();
+    api.wait_for_update(
+        VeilidUpdate::Attachment {
+            state: AttachmentState::Detached,
+        },
+        None,
+    )
+    .await
+    .unwrap();
     api.shutdown().await;
 
     info!("--- test auto detach ---");
-    let api = api_startup(setup_veilid_core())
+    let (update_callback, config_callback) = setup_veilid_core();
+    let api = api_startup(update_callback, config_callback)
         .await
         .expect("startup failed");
     api.attach().await.unwrap();
@@ -34,7 +42,8 @@ pub async fn test_attach_detach() {
     api.shutdown().await;
 
     info!("--- test detach without attach ---");
-    let api = api_startup(setup_veilid_core())
+    let (update_callback, config_callback) = setup_veilid_core();
+    let api = api_startup(update_callback, config_callback)
         .await
         .expect("startup failed");
     api.detach().await.unwrap();