ghassmo 5 лет назад
Родитель
Сommit
5b7c45e560
6 измененных файлов с 18 добавлено и 18 удалено
  1. 2 2
      Cargo.toml
  2. 4 4
      src/bin/drk.rs
  3. 5 5
      src/cli/client_cli/cli_config.rs
  4. 4 4
      src/cli/client_cli/drk_cli.rs
  5. 1 1
      src/cli/client_cli/mod.rs
  6. 2 2
      src/cli/mod.rs

+ 2 - 2
Cargo.toml

@@ -109,8 +109,8 @@ path = "src/bin/gatewayd.rs"
 name = "darkfid"
 path = "src/bin/darkfid.rs"
 [[bin]]
-name = "darkfi-cli"
-path = "src/bin/darkfi-cli.rs"
+name = "drk"
+path = "src/bin/drk.rs"
 
 [profile.release]
 debug = 1

+ 4 - 4
src/bin/darkfi-cli.rs → src/bin/drk.rs

@@ -1,4 +1,4 @@
-use drk::cli::{ClientCliConfig, DarkfiCli, DarkfiCliConfig};
+use drk::cli::{ClientCliConfig, DrkCli, DrkCliConfig};
 use drk::Result;
 
 use async_executor::Executor;
@@ -44,7 +44,7 @@ impl Drk {
     }
 }
 
-async fn start(_executor: Arc<Executor<'_>>, config: Arc<DarkfiCliConfig>) -> Result<()> {
+async fn start(_executor: Arc<Executor<'_>>, config: Arc<DrkCliConfig>) -> Result<()> {
     let url = config.rpc_url.clone();
 
     let mut client = Drk::new(url);
@@ -56,8 +56,8 @@ async fn start(_executor: Arc<Executor<'_>>, config: Arc<DarkfiCliConfig>) -> Re
 fn main() -> Result<()> {
     use simplelog::*;
 
-    let mut config = DarkfiCliConfig::load(PathBuf::from("darkfi_config_file"))?;
-    let options = Arc::new(DarkfiCli::load(&mut config)?);
+    let mut config = DrkCliConfig::load(PathBuf::from("darkfi_config_file"))?;
+    let options = Arc::new(DrkCli::load(&mut config)?);
 
     if options.change_config {
         config.save(PathBuf::from("darkfi_config_file"))?;

+ 5 - 5
src/cli/client_cli/cli_config.rs

@@ -31,10 +31,10 @@ pub trait ClientCliConfig: Encodable + Decodable + Default {
     }
 }
 
-impl ClientCliConfig for DarkfiCliConfig {} 
+impl ClientCliConfig for DrkCliConfig {} 
 impl ClientCliConfig for DarkfidCliConfig {} 
 
-pub struct DarkfiCliConfig {
+pub struct DrkCliConfig {
     pub rpc_url: String,
     pub log_path: String,
 }
@@ -47,7 +47,7 @@ pub struct DarkfidCliConfig {
     pub log_path: String,
 }
 
-impl Default for DarkfiCliConfig {
+impl Default for DrkCliConfig {
     fn default() -> Self {
         let rpc_url = String::from("http://127.0.0.1:8000");
         let log_path = String::from("/tmp/darkfi_cli.log");
@@ -109,7 +109,7 @@ impl Default for DarkfidCliConfig {
     }
 }
 
-impl Encodable for DarkfiCliConfig {
+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)?;
@@ -118,7 +118,7 @@ impl Encodable for DarkfiCliConfig {
     }
 }
 
-impl Decodable for DarkfiCliConfig {
+impl Decodable for DrkCliConfig {
     fn decode<D: std::io::Read>(mut d: D) -> Result<Self> {
         Ok(Self {
             rpc_url: Decodable::decode(&mut d)?,

+ 4 - 4
src/cli/client_cli/darkfi_cli.rs → src/cli/client_cli/drk_cli.rs

@@ -1,15 +1,15 @@
-use super::cli_config::DarkfiCliConfig;
+use super::cli_config::DrkCliConfig;
 use crate::Result;
 
 use clap::{App, AppSettings, Arg};
 
-pub struct DarkfiCli {
+pub struct DrkCli {
     pub change_config: bool,
     pub verbose: bool,
 }
 
-impl DarkfiCli {
-    pub fn load(config: &mut DarkfiCliConfig) -> Result<Self> {
+impl DrkCli {
+    pub fn load(config: &mut DrkCliConfig) -> Result<Self> {
         let app = App::new("Darkfi CLI")
             .version("0.1.0")
             .author("Amir Taaki <amir@dyne.org>")

+ 1 - 1
src/cli/client_cli/mod.rs

@@ -1,3 +1,3 @@
 pub mod cli_config;
-pub mod darkfi_cli; 
+pub mod drk_cli; 
 pub mod darkfid_cli;

+ 2 - 2
src/cli/mod.rs

@@ -1,6 +1,6 @@
 pub mod client_cli;
 pub mod service_cli;
 
-pub use client_cli::{darkfi_cli::DarkfiCli, darkfid_cli::DarkfidCli};
-pub use client_cli::cli_config::{DarkfidCliConfig, DarkfiCliConfig, ClientCliConfig};
+pub use client_cli::{drk_cli::DrkCli, darkfid_cli::DarkfidCli};
+pub use client_cli::cli_config::{DarkfidCliConfig, DrkCliConfig, ClientCliConfig};
 pub use service_cli::ServiceCli;