simplified naming of cli config structs

src/bin/darkfid.rs

@@ -1,5 +1,5 @@
 use drk::blockchain::{rocks::columns, Rocks, RocksColumn};
-use drk::cli::{DarkfidCli, DarkfidCliConfig};
+use drk::cli::{DarkfidCli, DarkfidConfig};
 use drk::crypto::{
     load_params,
     merkle::{CommitmentTree, IncrementalWitness},
@@ -158,7 +158,7 @@ pub async fn subscribe(gateway_slabs_sub: GatewaySlabsSubscriber, mut state: Sta
     }
 }
 
-async fn start(executor: Arc<Executor<'_>>, config: Arc<&DarkfidCliConfig>) -> Result<()> {
+async fn start(executor: Arc<Executor<'_>>, config: Arc<&DarkfidConfig>) -> Result<()> {
     let connect_addr: SocketAddr = config.connect_url.parse()?;
     let sub_addr: SocketAddr = config.subscriber_url.parse()?;
     let database_path = config.database_path.clone();
@@ -228,8 +228,8 @@ async fn start(executor: Arc<Executor<'_>>, config: Arc<&DarkfidCliConfig>) -> R
     Ok(())
 }
 
-fn set_default() -> Result<DarkfidCliConfig> {
-    let config_file = DarkfidCliConfig {
+fn set_default() -> Result<DarkfidConfig> {
+    let config_file = DarkfidConfig {
         connect_url: String::from("127.0.0.1:3333"),
         subscriber_url: String::from("127.0.0.1:4444"),
         rpc_url: String::from("127.0.0.1:8000"),
@@ -268,7 +268,7 @@ fn main() -> Result<()> {
     let str_buff = str::from_utf8(&toml)?;
 
     // read from config file
-    let config: DarkfidCliConfig = toml::from_str(str_buff)?;
+    let config: DarkfidConfig = toml::from_str(str_buff)?;
     let config_pointer = Arc::new(&config);
 
     let ex = Arc::new(Executor::new());

src/bin/drk.rs

@@ -1,4 +1,4 @@
-use drk::cli::{DrkCli, DrkCliConfig};
+use drk::cli::{DrkCli, DrkConfig};
 use drk::util;
 use drk::Result;
 use log::*;
@@ -145,7 +145,7 @@ fn main() -> Result<()> {
     let str_buff = str::from_utf8(&toml)?;
 
     // read from config file
-    let config: DrkCliConfig = toml::from_str(str_buff)?;
+    let config: DrkConfig = toml::from_str(str_buff)?;
     let config_pointer = Arc::new(&config);
 
     let logger_config = ConfigBuilder::new().set_time_format_str("%T%.6f").build();

src/cli/client_cli/cli_config.rs

@@ -51,7 +51,7 @@ use serde::{Deserialize, Serialize};
 //}
 
 #[derive(Serialize, Default, Deserialize, Debug)]
-pub struct DrkCliConfig {
+pub struct DrkConfig {
     #[serde(rename = "RPC URL")]
     pub rpc_url: String,
 
@@ -60,7 +60,7 @@ pub struct DrkCliConfig {
 }
 
 #[derive(Serialize, Default, Deserialize, Debug)]
-pub struct DarkfidCliConfig {
+pub struct DarkfidConfig {
     #[serde(rename = "Connect URL")]
     pub connect_url: String,
 
@@ -92,32 +92,6 @@ pub struct DarkfidCliConfig {
 //    }
 //}
 
-//impl Encodable for DarkfidCliConfig {
-//    fn encode<S: std::io::Write>(&self, mut s: S) -> Result<usize> {
-//        let mut len = 0;
-//        len += self.connect_url.encode(&mut s)?;
-//        len += self.subscriber_url.encode(&mut s)?;
-//        len += self.rpc_url.encode(&mut s)?;
-//        len += self.database_path.encode(&mut s)?;
-//        len += self.log_path.encode(&mut s)?;
-//        len += self.password.encode(&mut s)?;
-//        Ok(len)
-//    }
-//}
-//
-//impl Decodable for DarkfidCliConfig {
-//    fn decode<D: std::io::Read>(mut d: D) -> Result<Self> {
-//        Ok(Self {
-//            connect_url: Decodable::decode(&mut d)?,
-//            subscriber_url: Decodable::decode(&mut d)?,
-//            rpc_url: Decodable::decode(&mut d)?,
-//            database_path: Decodable::decode(&mut d)?,
-//            log_path: Decodable::decode(&mut d)?,
-//            password: Decodable::decode(&mut d)?,
-//        })
-//    }
-//}
-
 //impl Default for DarkfidCliConfig {
 //    // create default config file
 //    fn default() -> Self {
@@ -150,20 +124,3 @@ pub struct DarkfidCliConfig {
 //    }
 //}
 
-//impl Encodable for DrkCliConfig {
-//    fn encode<S: std::io::Write>(&self, mut s: S) -> Result<usize> {
-//        let mut len = 0;
-//        len += self.rpc_url.encode(&mut s)?;
-//        len += self.log_path.encode(&mut s)?;
-//        Ok(len)
-//    }
-//}
-//
-//impl Decodable for DrkCliConfig {
-//    fn decode<D: std::io::Read>(mut d: D) -> Result<Self> {
-//        Ok(Self {
-//            rpc_url: Decodable::decode(&mut d)?,
-//            log_path: Decodable::decode(&mut d)?,
-//        })
-//    }
-//}

src/cli/mod.rs

@@ -1,6 +1,6 @@
 pub mod client_cli;
 pub mod service_cli;
 
-pub use client_cli::cli_config::{DarkfidCliConfig, DrkCliConfig};
+pub use client_cli::cli_config::{DarkfidConfig, DrkConfig};
 pub use client_cli::{darkfid_cli::DarkfidCli, drk_cli::DrkCli, drk_cli::Transfer};
 pub use service_cli::ServiceCli;

src/rpc/jsonserver.rs

@@ -1,4 +1,4 @@
-use crate::cli::DarkfidCliConfig;
+use crate::cli::DarkfidConfig;
 use crate::rpc::adapter::RpcAdapter;
 use crate::{Error, Result};
 use async_executor::Executor;
@@ -73,7 +73,7 @@ pub async fn listen(
 
 pub async fn start(
     executor: Arc<Executor<'_>>,
-    config: Arc<&DarkfidCliConfig>,
+    config: Arc<&DarkfidConfig>,
     adapter: RpcAdapter,
 ) -> Result<()> {
     let rpc = RpcInterface::new(adapter)?;