From f9d6bc3440c59d7e7df3e1ed2b20cb4649c80cb5 Mon Sep 17 00:00:00 2001
From: Luther Blissett <luther@blissett.com>
Date: Sat, 24 Sep 2022 15:24:17 +0200
Subject: [PATCH] dnetview: Import fixes and explicit hex crate usage.

---
 bin/dnetview/Cargo.toml    |  2 +-
 bin/dnetview/src/main.rs   | 16 +++++++++-------
 bin/dnetview/src/model.rs  |  3 +--
 bin/dnetview/src/parser.rs |  8 ++++----
 bin/dnetview/src/rpc.rs    |  6 +++---
 bin/dnetview/src/util.rs   | 24 +++++++++---------------
 bin/dnetview/src/view.rs   |  3 +--
 7 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/bin/dnetview/Cargo.toml b/bin/dnetview/Cargo.toml
index 19b0cf3ee..957578bec 100644
--- a/bin/dnetview/Cargo.toml
+++ b/bin/dnetview/Cargo.toml
@@ -36,4 +36,4 @@ thiserror = "1.0.34"
 # Encoding and parsing
 serde_json = "1.0.85"
 serde = {version = "1.0.144", features = ["derive"]}
-
+hex = "0.4.3"
diff --git a/bin/dnetview/src/main.rs b/bin/dnetview/src/main.rs
index a021fcc6a..71441317b 100644
--- a/bin/dnetview/src/main.rs
+++ b/bin/dnetview/src/main.rs
@@ -1,12 +1,7 @@
-use async_std::sync::Arc;
 use std::{fs::File, io, io::Read};
 
+use async_std::sync::Arc;
 use clap::Parser;
-use darkfi::util::{
-    cli::{get_log_config, get_log_level, spawn_config, Config},
-    expand_path,
-    path::get_config_path,
-};
 use easy_parallel::Parallel;
 use log::info;
 use simplelog::*;
@@ -16,6 +11,13 @@ use tui::{
     backend::{Backend, TermionBackend},
     Terminal,
 };
+
+use darkfi::util::{
+    async_util,
+    cli::{get_log_config, get_log_level, spawn_config, Config},
+    path::{expand_path, get_config_path},
+};
+
 pub mod config;
 pub mod error;
 pub mod model;
@@ -101,7 +103,7 @@ impl DnetView {
                     _ => (),
                 }
             }
-            util::sleep(100).await;
+            async_util::msleep(100).await;
         }
     }
 }
diff --git a/bin/dnetview/src/model.rs b/bin/dnetview/src/model.rs
index e0356e8f3..31ff4fa81 100644
--- a/bin/dnetview/src/model.rs
+++ b/bin/dnetview/src/model.rs
@@ -1,9 +1,8 @@
 use async_std::sync::{Arc, Mutex};
-
 use fxhash::FxHashMap;
 use serde::{Deserialize, Serialize};
 
-use darkfi::util::NanoTimestamp;
+use darkfi::util::time::NanoTimestamp;
 
 type MsgLog = Vec<(NanoTimestamp, String, String)>;
 type MsgMap = Mutex<FxHashMap<String, MsgLog>>;
diff --git a/bin/dnetview/src/parser.rs b/bin/dnetview/src/parser.rs
index e793a53f1..40780a5af 100644
--- a/bin/dnetview/src/parser.rs
+++ b/bin/dnetview/src/parser.rs
@@ -1,12 +1,12 @@
-use async_std::sync::Arc;
 use std::collections::hash_map::Entry;
 
+use async_std::sync::Arc;
 use log::{debug, error, info};
 use serde_json::Value;
 use smol::Executor;
 use url::Url;
 
-use darkfi::util::NanoTimestamp;
+use darkfi::util::{async_util, time::NanoTimestamp};
 
 use crate::{
     config::{DnvConfig, Node, NodeType},
@@ -55,7 +55,7 @@ impl DataParser {
                 }
             }
             self.parse_offline(node.name.clone()).await?;
-            crate::util::sleep(2000).await;
+            async_util::sleep(2000).await;
         }
     }
 
@@ -96,7 +96,7 @@ impl DataParser {
             }
 
             // Sleep until next poll
-            crate::util::sleep(2000).await;
+            async_util::sleep(2000).await;
         }
     }
 
diff --git a/bin/dnetview/src/rpc.rs b/bin/dnetview/src/rpc.rs
index bdd889f8f..01c07fc22 100644
--- a/bin/dnetview/src/rpc.rs
+++ b/bin/dnetview/src/rpc.rs
@@ -1,11 +1,11 @@
+use serde_json::{json, Value};
+use url::Url;
+
 use darkfi::{
     error::Result,
     rpc::{client::RpcClient, jsonrpc::JsonRequest},
 };
 
-use serde_json::{json, Value};
-use url::Url;
-
 use crate::error::{DnetViewError, DnetViewResult};
 
 pub struct RpcConnect {
diff --git a/bin/dnetview/src/util.rs b/bin/dnetview/src/util.rs
index 113485947..c8b598869 100644
--- a/bin/dnetview/src/util.rs
+++ b/bin/dnetview/src/util.rs
@@ -1,15 +1,9 @@
-use crate::model::{ConnectInfo, Session};
-use darkfi::{util::serial, Result};
-use smol::Timer;
-use std::time::Duration;
+use darkfi::Result;
 
-/// Sleep for any number of milliseconds.
-pub async fn sleep(millis: u64) {
-    Timer::after(Duration::from_millis(millis)).await;
-}
+use crate::model::{ConnectInfo, Session};
 
 pub fn make_node_id(node_name: &String) -> Result<String> {
-    let mut id = serial::serialize_hex(node_name);
+    let mut id = hex::encode(node_name);
     id.insert_str(0, "NODE");
     Ok(id)
 }
@@ -32,13 +26,13 @@ pub fn make_session_id(node_id: &str, session: &Session) -> Result<String> {
         num += i as u64
     }
 
-    let mut id = serial::serialize_hex(&num);
+    let mut id = hex::encode(&num.to_ne_bytes());
     id.insert_str(0, "SESSION");
     Ok(id)
 }
 
 pub fn make_connect_id(id: &u64) -> Result<String> {
-    let mut id = serial::serialize_hex(id);
+    let mut id = hex::encode(&id.to_ne_bytes());
     id.insert_str(0, "CONNECT");
     Ok(id)
 }
@@ -58,7 +52,7 @@ pub fn make_empty_id(node_id: &str, session: &Session, count: u64) -> Result<Str
                 num += i as u64
             }
             num += count;
-            let mut id = serial::serialize_hex(&num);
+            let mut id = hex::encode(&num.to_ne_bytes());
             id.insert_str(0, "EMPTYIN");
             id
         }
@@ -71,7 +65,7 @@ pub fn make_empty_id(node_id: &str, session: &Session, count: u64) -> Result<Str
                 num += i as u64
             }
             num += count;
-            let mut id = serial::serialize_hex(&num);
+            let mut id = hex::encode(&num.to_ne_bytes());
             id.insert_str(0, "EMPTYOUT");
             id
         }
@@ -84,7 +78,7 @@ pub fn make_empty_id(node_id: &str, session: &Session, count: u64) -> Result<Str
                 num += i as u64
             }
             num += count;
-            let mut id = serial::serialize_hex(&num);
+            let mut id = hex::encode(&num.to_ne_bytes());
             id.insert_str(0, "EMPTYMAN");
             id
         }
@@ -97,7 +91,7 @@ pub fn make_empty_id(node_id: &str, session: &Session, count: u64) -> Result<Str
                 num += i as u64
             }
             num += count;
-            let mut id = serial::serialize_hex(&num);
+            let mut id = hex::encode(&num.to_ne_bytes());
             id.insert_str(0, "EMPTYOFF");
             id
         }
diff --git a/bin/dnetview/src/view.rs b/bin/dnetview/src/view.rs
index 9b43d445a..c3dd3de21 100644
--- a/bin/dnetview/src/view.rs
+++ b/bin/dnetview/src/view.rs
@@ -1,5 +1,4 @@
 use fxhash::FxHashMap;
-
 use tui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
@@ -9,7 +8,7 @@ use tui::{
     Frame,
 };
 
-use darkfi::util::NanoTimestamp;
+use darkfi::util::time::NanoTimestamp;
 
 use crate::{
     error::{DnetViewError, DnetViewResult},