diff --git a/waku-bindings/src/node/config.rs b/waku-bindings/src/node/config.rs index 0cff8ee..6a5edb5 100644 --- a/waku-bindings/src/node/config.rs +++ b/waku-bindings/src/node/config.rs @@ -45,14 +45,14 @@ pub struct WakuNodeConfig { /// Enable DiscoveryV5. Default `false` #[default(Some(false))] #[serde(rename = "discV5")] - pub disc_v5: Option, + pub discv5: Option, /// Array of bootstrap nodes ENR. #[serde(rename = "discV5BootstrapNodes")] - pub disc_v5_bootstrap_nodes: Vec, + pub discv5_bootstrap_nodes: Vec, /// UDP port for DiscoveryV5. Default `9000`. #[default(Some(9000))] #[serde(rename = "discV5UDPPort")] - pub disc_v5_udp_port: Option, + pub discv5_udp_port: Option, } #[derive(Clone, Default, Serialize, Deserialize, Debug)] diff --git a/waku-bindings/src/node/disc_v5.rs b/waku-bindings/src/node/discv5.rs similarity index 100% rename from waku-bindings/src/node/disc_v5.rs rename to waku-bindings/src/node/discv5.rs diff --git a/waku-bindings/src/node/mod.rs b/waku-bindings/src/node/mod.rs index a1681b2..ca26251 100644 --- a/waku-bindings/src/node/mod.rs +++ b/waku-bindings/src/node/mod.rs @@ -1,7 +1,7 @@ //! Waku node implementation mod config; -mod disc_v5; +mod discv5; mod discovery; mod filter; mod lightpush; @@ -27,7 +27,6 @@ use crate::general::{ }; pub use config::{WakuLogLevel, WakuNodeConfig}; -pub use disc_v5::{waku_discv5_start, waku_discv5_stop}; pub use peers::{Protocol, WakuPeerData, WakuPeers}; pub use relay::{waku_create_content_topic, waku_create_pubsub_topic, waku_dafault_pubsub_topic}; pub use store::waku_store_query; @@ -90,6 +89,16 @@ fn stop_node() -> Result<()> { } impl WakuNodeHandle { + /// Starts the DiscoveryV5 service to discover and connect to new peers + pub fn discv5_start(&self) -> Result { + discv5::waku_discv5_start() + } + + /// Stops the DiscoveryV5 service + pub fn discv5_stop(&self) -> Result { + discv5::waku_discv5_stop() + } + /// Start a Waku node mounting all the protocols that were enabled during the Waku node instantiation. /// as per the [specification](https://rfc.vac.dev/spec/36/#extern-char-waku_start) pub fn start(self) -> Result> { diff --git a/waku-bindings/tests/node.rs b/waku-bindings/tests/node.rs index 99211cb..cc664cc 100644 --- a/waku-bindings/tests/node.rs +++ b/waku-bindings/tests/node.rs @@ -29,9 +29,9 @@ pub fn main() -> Result<(), String> { min_peers_to_publish: None, filter: None, log_level: Some(WakuLogLevel::Error), - disc_v5: Some(false), - disc_v5_udp_port: Some(9000), - disc_v5_bootstrap_nodes: Vec::new(), + discv5: Some(false), + discv5_udp_port: Some(9000), + discv5_bootstrap_nodes: Vec::new(), }; let node = waku_new(Some(config))?; let node = node.start()?;