From e742a477db244159e951484cfab8c50e84e6b7a1 Mon Sep 17 00:00:00 2001
From: Daniel Sanchez Quiros <sanchez.quiros.daniel@gmail.com>
Date: Mon, 3 Oct 2022 19:03:58 +0200
Subject: [PATCH] Refactor node -> management

---
 waku/src/general/mod.rs                             |  2 ++
 waku/src/lib.rs                                     |  2 +-
 waku/src/{node_management => node}/config.rs        |  0
 .../{node_management/node.rs => node/management.rs} |  4 +---
 waku/src/{node_management => node}/mod.rs           | 13 +++++++------
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename waku/src/{node_management => node}/config.rs (100%)
 rename waku/src/{node_management/node.rs => node/management.rs} (96%)
 rename waku/src/{node_management => node}/mod.rs (86%)

diff --git a/waku/src/general/mod.rs b/waku/src/general/mod.rs
index 43e1b27..d6de08b 100644
--- a/waku/src/general/mod.rs
+++ b/waku/src/general/mod.rs
@@ -6,6 +6,8 @@ use serde::{Deserialize, Serialize};
 pub type PubsubTopic = String;
 pub type ContentTopic = String;
 pub type WakuMessageVersion = usize;
+/// Base58 encoded peer id
+pub type PeerId = String;
 
 /// JsonResponse wrapper.
 /// `go-waku` ffi returns this type as a `char *` as per the [specification](https://rfc.vac.dev/spec/36/#jsonresponse-type)
diff --git a/waku/src/lib.rs b/waku/src/lib.rs
index 95aa506..3494379 100644
--- a/waku/src/lib.rs
+++ b/waku/src/lib.rs
@@ -1,6 +1,6 @@
 mod events;
 mod general;
-mod node_management;
+mod node;
 
 #[cfg(test)]
 mod tests {
diff --git a/waku/src/node_management/config.rs b/waku/src/node/config.rs
similarity index 100%
rename from waku/src/node_management/config.rs
rename to waku/src/node/config.rs
diff --git a/waku/src/node_management/node.rs b/waku/src/node/management.rs
similarity index 96%
rename from waku/src/node_management/node.rs
rename to waku/src/node/management.rs
index 5f02897..9c7f36e 100644
--- a/waku/src/node_management/node.rs
+++ b/waku/src/node/management.rs
@@ -79,9 +79,7 @@ pub fn waku_listen_addressses() -> Result<Vec<Multiaddr>> {
 #[cfg(test)]
 mod test {
     use super::waku_new;
-    use crate::node_management::node::{
-        waku_listen_addressses, waku_peer_id, waku_start, waku_stop,
-    };
+    use crate::node::management::{waku_listen_addressses, waku_peer_id, waku_start, waku_stop};
 
     #[test]
     fn waku_flow() {
diff --git a/waku/src/node_management/mod.rs b/waku/src/node/mod.rs
similarity index 86%
rename from waku/src/node_management/mod.rs
rename to waku/src/node/mod.rs
index c19d941..532b49f 100644
--- a/waku/src/node_management/mod.rs
+++ b/waku/src/node/mod.rs
@@ -1,5 +1,6 @@
 mod config;
-mod node;
+mod management;
+mod peers;
 
 // std
 use multiaddr::Multiaddr;
@@ -30,11 +31,11 @@ pub struct WakuNodeHandle<State: WakuNodeState>(PhantomData<State>);
 
 impl<State: WakuNodeState> WakuNodeHandle<State> {
     pub fn peer_id(&self) -> Result<String> {
-        node::waku_peer_id()
+        management::waku_peer_id()
     }
 
     pub fn listen_addresses(&self) -> Result<Vec<Multiaddr>> {
-        node::waku_listen_addressses()
+        management::waku_listen_addressses()
     }
 }
 fn stop_node() -> Result<()> {
@@ -42,12 +43,12 @@ fn stop_node() -> Result<()> {
         .lock()
         .expect("Access to the mutex at some point");
     *node_initialized = false;
-    node::waku_stop().map(|_| ())
+    management::waku_stop().map(|_| ())
 }
 
 impl WakuNodeHandle<Initialized> {
     pub fn start(self) -> Result<WakuNodeHandle<Running>> {
-        node::waku_start().map(|_| WakuNodeHandle(Default::default()))
+        management::waku_start().map(|_| WakuNodeHandle(Default::default()))
     }
 
     pub fn stop(self) -> Result<()> {
@@ -69,7 +70,7 @@ pub fn waku_new(config: Option<WakuNodeConfig>) -> Result<WakuNodeHandle<Initial
         return Err("Waku node is already initialized".into());
     }
     *node_initialized = true;
-    node::waku_new(config).map(|_| WakuNodeHandle(Default::default()))
+    management::waku_new(config).map(|_| WakuNodeHandle(Default::default()))
 }
 
 #[cfg(test)]