darkpulse: cleanup & organize modules structure

src/bin/darkpulse.rs

@@ -1,18 +1,15 @@
 use async_std::sync::{Arc, Mutex};
-
-use drk::darkpulse::{
-    dbsql, net::messages, utility, CiphertextHash, cli_option::CliOption, control_message::ControlCommand, MemPool,
-    slabs_manager::SlabsManager,
-};
-
-use drk::Result;
-
 use async_executor::Executor;
 use easy_parallel::Parallel;
 use log::*;
-use drk::net::P2p;
 use smol::Unblock;
 
+use drk::darkpulse::{
+    dbsql, messages, utility, CiphertextHash, CliOption, ControlCommand, MemPool,
+    SlabsManager,
+};
+use drk::{Result, net::P2p};
+
 async fn on_receive_slab(
     p2p: Arc<P2p>,
     slab_rx: async_channel::Receiver<CiphertextHash>,

src/darkpulse/aes.rs

@@ -1,3 +1,4 @@
+
 use aes_gcm::aead::{generic_array::GenericArray, Aead, NewAead};
 use aes_gcm::Aes256Gcm;
 

src/darkpulse/channel.rs

@@ -1,3 +1,4 @@
+
 use bs58;
 use rand::Rng;
 use sha2::{Digest, Sha256};
@@ -89,7 +90,8 @@ impl Channel {
 
 #[cfg(test)]
 mod tests {
-    use crate::{Channel, Result};
+    use super::Channel;
+    use crate::Result;
 
     #[test]
     fn create_channel_form_address() -> Result<()> {

src/darkpulse/cli_option.rs

@@ -2,9 +2,8 @@ use std::net::SocketAddr;
 
 use clap::{App, Arg, SubCommand};
 
-use super::channel::Channel;
-use crate::net::Settings;
-use crate::Result;
+use super::Channel;
+use crate::{net::Settings, Result};
 
 pub struct CliOption {
     pub network_settings: Settings,

src/darkpulse/control_message.rs

@@ -1,7 +1,6 @@
 use std::io;
 
-use crate::serial::{Decodable, Encodable};
-use crate::Result;
+use crate::{serial::{Decodable, Encodable}, Result};
 
 #[derive(Copy, Clone)]
 pub enum ControlCommand {

src/darkpulse/dbsql.rs

@@ -6,10 +6,8 @@ use std::io::prelude::*;
 use rusqlite::{params, Connection};
 
 use crate::Result;
-
-use super::{net::messages::SlabMessage, CiphertextHash,utility::default_config_dir, 
-    channel::Channel};
-
+use super::{SlabMessage, CiphertextHash,utility::default_config_dir,
+Channel};
 
 #[derive(Debug)]
 pub struct Dbsql {

src/darkpulse/error.rs

@@ -1,34 +0,0 @@
-use crate::error::Error as DarkFiError;
-use std::fmt;
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-#[derive(Debug)]
-pub enum Error {
-    SqliteError(String),
-    DarkFiError(DarkFiError),
-}
-
-impl std::error::Error for Error {}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
-        match *self {
-            Error::SqliteError(ref e) => write!(f, "database sqlite error: {}", e),
-            Error::DarkFiError(ref e) => write!(f, "darkfi internal error : {}", e),
-        }
-    }
-}
-
-impl From<DarkFiError> for Error {
-    fn from(err: DarkFiError) -> Error {
-        Error::DarkFiError(err)
-    }
-}
-
-impl From<rusqlite::Error> for Error {
-    fn from(err: rusqlite::Error) -> Error {
-        Error::SqliteError(err.to_string())
-    }
-}
-

src/darkpulse/mod.rs

@@ -6,10 +6,18 @@ pub mod dbsql;
 pub mod net;
 pub mod slabs_manager;
 pub mod utility;
-pub mod error;
 
 use async_std::sync::{Arc, Mutex};
 
 pub type CiphertextHash = [u8; 32];
 pub type MemPool = Arc<Mutex<Vec<(CiphertextHash, net::messages::SlabMessage)>>>;
 
+
+pub use aes::{aes_decrypt, Ciphertext, Plaintext, aes_encrypt};
+pub use channel::Channel;
+pub use cli_option::CliOption;
+pub use control_message::{ControlMessage, ControlCommand, MessagePayload};
+pub use net::{messages, messages::SlabMessage, protocol_slab::ProtocolSlab};
+pub use dbsql::Dbsql; 
+pub use slabs_manager::{SlabsManager, SlabsManagerSafe};
+

src/darkpulse/net/messages.rs

@@ -5,8 +5,7 @@ use crate::{
     serial::{Decodable, Encodable},
     Result
 };
-
-use crate::darkpulse::aes::Ciphertext;
+use crate::darkpulse::Ciphertext;
 
 #[derive(Clone)]
 pub struct GetSlabsMessage {

src/darkpulse/net/protocol_slab.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-
 use log::*;
 use smol::Executor;
 
@@ -8,9 +7,7 @@ use crate::error::Result as NetResult;
 use crate::serial::deserialize;
 use crate::net::{message_subscriber::MessageSubscription, protocols::ProtocolJobsManager,
 protocols::ProtocolJobsManagerPtr ,ChannelPtr};
-
-use crate::darkpulse::{aes::aes_decrypt, net::messages, control_message::ControlCommand,
-control_message::ControlMessage, slabs_manager::SlabsManagerSafe, CiphertextHash};
+use crate::darkpulse::{aes_decrypt, messages, ControlCommand, ControlMessage, SlabsManagerSafe, CiphertextHash};
 
 pub struct ProtocolSlab {
     channel: ChannelPtr,

src/darkpulse/slabs_manager.rs

@@ -5,7 +5,6 @@ use log::*;
 use sha2::{Digest, Sha256};
 
 use crate:: Result;
-
 use super::{dbsql, net::messages::SlabMessage, channel::Channel, CiphertextHash, aes::Ciphertext};
 
 pub fn cipher_hash(ciphertext: &Ciphertext) -> CiphertextHash {

src/darkpulse/utility.rs

@@ -10,9 +10,8 @@ use async_executor::Executor;
 use futures::prelude::*;
 use log::*;
 
-use super::{aes::aes_encrypt, dbsql, net::messages, net::protocol_slab::ProtocolSlab,
-control_message::ControlMessage, control_message::ControlCommand, channel::Channel,
-slabs_manager::SlabsManagerSafe, control_message::MessagePayload};
+use super::{aes_encrypt, Dbsql, messages, ProtocolSlab, ControlMessage, ControlCommand, Channel,
+SlabsManagerSafe, MessagePayload};
 
 
 use crate::{ serial::{serialize, deserialize}, net::ChannelPtr, Result};
@@ -109,7 +108,7 @@ pub async fn pack_slab(
     Ok(slab)
 }
 
-pub fn setup_username(newname: Option<String>, db: &dbsql::Dbsql) -> Result<String> {
+pub fn setup_username(newname: Option<String>, db: &Dbsql) -> Result<String> {
     let mut _username: String = String::new();
     match newname {
         Some(nm) => {
@@ -132,7 +131,7 @@ pub async fn read_line<R: AsyncBufRead + Unpin>(reader: &mut R) -> Result<String
     Ok(buf.trim().to_string())
 }
 
-pub fn choose_channel(db: &dbsql::Dbsql, channel_name: Option<String>) -> Result<Channel> {
+pub fn choose_channel(db: &Dbsql, channel_name: Option<String>) -> Result<Channel> {
     let channels = db.get_channels()?;
     let mut main_channel = Channel::gen_new(String::from("test_channel"));
     if channels.len() > 0 {