Sfoglia il codice sorgente

dnetview/ util: added missing file

lunar-mining 4 anni fa
parent
commit
f741f02a60

+ 50 - 0
bin/dnetview/src/util.rs

@@ -0,0 +1,50 @@
+use crate::model::Session;
+use darkfi::{util::serial, Result};
+use rand::{thread_rng, Rng};
+
+pub fn make_node_id(node_name: &String) -> Result<String> {
+    Ok(serial::serialize_hex(node_name))
+}
+
+pub fn make_session_id(node_id: String, session: &Session) -> Result<String> {
+    let mut num = 0_u64;
+
+    match session {
+        Session::Inbound => {
+            for i in ['i', 'n'] {
+                num += i as u64;
+            }
+        }
+        Session::Outbound => {
+            for i in ['o', 'u', 't'] {
+                num += i as u64;
+            }
+        }
+        Session::Manual => {
+            for i in ['m', 'a', 'n'] {
+                num += i as u64;
+            }
+        }
+    }
+
+    for i in node_id.chars() {
+        num += i as u64
+    }
+
+    Ok(serial::serialize_hex(&num))
+}
+
+pub fn make_connect_id(id: u64) -> Result<String> {
+    Ok(serial::serialize_hex(&id))
+}
+
+// we use a random id for empty connections
+pub fn generate_id() -> Result<String> {
+    let mut rng = thread_rng();
+    let id: u32 = rng.gen();
+    Ok(serial::serialize_hex(&id))
+}
+
+//pub fn is_empty_outbound(slots: Vec<Slot>) -> bool {
+//    return slots.iter().all(|slot| slot.is_empty);
+//}

+ 1 - 1
bin/tau/taud/src/main.rs

@@ -63,7 +63,7 @@ async fn realmain(settings: Args, executor: Arc<Executor<'_>>) -> Result<()> {
     let rpc_listener_taks =
         executor_cloned.spawn(listen_and_serve(server_config, rpc_interface, executor.clone()));
 
-    let net_settings = settings.net; 
+    let net_settings = settings.net;
 
     //
     //Raft

+ 0 - 1
bin/tau/taud/src/settings.rs

@@ -29,4 +29,3 @@ pub struct Args {
     #[structopt(short, parse(from_occurrences))]
     pub verbose: u8,
 }
-

+ 3 - 3
src/net/settings.rs

@@ -46,7 +46,7 @@ impl Default for Settings {
 pub struct SettingsOpt {
     /// P2P accept address
     #[structopt(long = "accept")]
-    pub inbound: Option<SocketAddr>,     
+    pub inbound: Option<SocketAddr>,
 
     /// Connection slots
     #[structopt(long = "slots", default_value = "0")]
@@ -56,11 +56,11 @@ pub struct SettingsOpt {
     #[structopt(long)]
     pub external_addr: Option<SocketAddr>,
 
-    /// Peer nodes to connect to 
+    /// Peer nodes to connect to
     #[structopt(long)]
     pub peers: Vec<SocketAddr>,
 
-    /// Seed nodes to connect to 
+    /// Seed nodes to connect to
     #[structopt(long)]
     pub seeds: Vec<SocketAddr>,