From a4777fc5519a7fad2f1bf1c0dcc1de8ca973a52c Mon Sep 17 00:00:00 2001 From: carvilsi Date: Wed, 19 Mar 2025 04:11:04 +0100 Subject: [PATCH 1/4] adds get_node_id for api --- veilid-core/src/tests/common/test_veilid_core.rs | 15 +++++++++++++++ veilid-core/src/veilid_api/api.rs | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/veilid-core/src/tests/common/test_veilid_core.rs b/veilid-core/src/tests/common/test_veilid_core.rs index e54038d7..b89d0c68 100644 --- a/veilid-core/src/tests/common/test_veilid_core.rs +++ b/veilid-core/src/tests/common/test_veilid_core.rs @@ -192,6 +192,20 @@ pub async fn test_attach_detach_multiple() { } } +pub async fn test_get_node_id() { + trace!("test get node id"); + let (update_callback, config_callback) = setup_veilid_core(); + let api = api_startup(update_callback, config_callback) + .await + .expect("startup failed"); + api.attach().await.unwrap(); + sleep(5000).await; + assert_eq!(api.get_node_id().unwrap(), api.config().unwrap().get().network.routing_table.node_id); + api.detach().await.unwrap(); + sleep(2000).await; + api.shutdown().await; +} + pub async fn test_all() { test_startup_shutdown().await; test_startup_shutdown_from_config().await; @@ -199,4 +213,5 @@ pub async fn test_all() { test_startup_shutdown_multiple().await; test_startup_shutdown_from_config_multiple().await; test_attach_detach_multiple().await; + test_get_node_id().await; } diff --git a/veilid-core/src/veilid_api/api.rs b/veilid-core/src/veilid_api/api.rs index 5e1fb4bb..7adcf973 100644 --- a/veilid-core/src/veilid_api/api.rs +++ b/veilid-core/src/veilid_api/api.rs @@ -136,6 +136,10 @@ impl VeilidAPI { .ok_or(VeilidAPIError::NotInitialized) } + pub fn get_node_id(&self) -> VeilidAPIResult> { + Ok(self.config()?.get().network.routing_table.node_id.clone()) + } + //////////////////////////////////////////////////////////////// // Internal Accessors From 3abadd1184985de72206366951c277242d4fad6e Mon Sep 17 00:00:00 2001 From: carvilsi Date: Wed, 19 Mar 2025 05:51:01 +0100 Subject: [PATCH 2/4] adding doc comment --- veilid-core/src/veilid_api/api.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/veilid-core/src/veilid_api/api.rs b/veilid-core/src/veilid_api/api.rs index 7adcf973..26d37891 100644 --- a/veilid-core/src/veilid_api/api.rs +++ b/veilid-core/src/veilid_api/api.rs @@ -136,6 +136,7 @@ impl VeilidAPI { .ok_or(VeilidAPIError::NotInitialized) } + /// Get the Node ID. pub fn get_node_id(&self) -> VeilidAPIResult> { Ok(self.config()?.get().network.routing_table.node_id.clone()) } From 85698c3489d06b814c7d238c594d591481387dc5 Mon Sep 17 00:00:00 2001 From: carvilsi Date: Wed, 19 Mar 2025 05:55:25 +0100 Subject: [PATCH 3/4] updates README --- README-pt_BR.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-pt_BR.md b/README-pt_BR.md index f2ee033c..824f156f 100644 --- a/README-pt_BR.md +++ b/README-pt_BR.md @@ -67,7 +67,7 @@ async fn main() { }; let veilid = veilid_core::api_startup_config(update_callback, config).await.unwrap(); - println!("Node ID: {}", veilid.config().unwrap().get().network.routing_table.node_id); + println!("Node ID: {}", veilid.get_node_id().unwrap()); veilid.attach().await.unwrap(); // Until CTRL+C is pressed, keep running tokio::signal::ctrl_c().await.unwrap(); diff --git a/README.md b/README.md index bede35a7..63bf1340 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ async fn main() { }; let veilid = veilid_core::api_startup_config(update_callback, config).await.unwrap(); - println!("Node ID: {}", veilid.config().unwrap().get().network.routing_table.node_id); + println!("Node ID: {}", veilid.get_node_id().unwrap()); veilid.attach().await.unwrap(); // Until CTRL+C is pressed, keep running tokio::signal::ctrl_c().await.unwrap(); From 67dd25f473920746485ff7d29fbc86a74e8f6071 Mon Sep 17 00:00:00 2001 From: carvilsi Date: Wed, 19 Mar 2025 06:19:40 +0100 Subject: [PATCH 4/4] fmt fixies --- veilid-core/src/tests/common/test_veilid_core.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veilid-core/src/tests/common/test_veilid_core.rs b/veilid-core/src/tests/common/test_veilid_core.rs index b89d0c68..4434da38 100644 --- a/veilid-core/src/tests/common/test_veilid_core.rs +++ b/veilid-core/src/tests/common/test_veilid_core.rs @@ -200,7 +200,10 @@ pub async fn test_get_node_id() { .expect("startup failed"); api.attach().await.unwrap(); sleep(5000).await; - assert_eq!(api.get_node_id().unwrap(), api.config().unwrap().get().network.routing_table.node_id); + assert_eq!( + api.get_node_id().unwrap(), + api.config().unwrap().get().network.routing_table.node_id + ); api.detach().await.unwrap(); sleep(2000).await; api.shutdown().await;