diff --git a/src/bin/darkfid2.rs b/src/bin/darkfid2.rs index 7061713b7..d858c83e6 100644 --- a/src/bin/darkfid2.rs +++ b/src/bin/darkfid2.rs @@ -3,6 +3,7 @@ use log::*; use std::path::PathBuf; use clap::clap_app; +use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; use simplelog::{ CombinedLogger, Config as SimLogConfig, ConfigBuilder, LevelFilter, TermLogger, TerminalMode, @@ -12,7 +13,7 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::net::TcpListener; use drk::{ - cli::{Config, DarkfidConfig}, + cli::Config, rpc::{ jsonrpc, jsonrpc::{JsonRequest, JsonResult}, @@ -23,6 +24,33 @@ use drk::{ Error, }; +#[derive(Clone, Serialize, Deserialize, Debug)] +struct DarkfidConfig { + #[serde(rename = "connect_url")] + connect_url: String, + + #[serde(rename = "subscriber_url")] + subscriber_url: String, + + #[serde(rename = "cashier_url")] + cashier_url: String, + + #[serde(rename = "rpc_url")] + rpc_url: String, + + #[serde(rename = "database_path")] + database_path: String, + + #[serde(rename = "walletdb_path")] + walletdb_path: String, + + #[serde(rename = "log_path")] + log_path: String, + + #[serde(rename = "password")] + password: String, +} + #[derive(Clone)] struct Darkfid { verbose: bool, diff --git a/src/cli/cli_config.rs b/src/cli/cli_config.rs index c49167ec5..293e1a2d3 100644 --- a/src/cli/cli_config.rs +++ b/src/cli/cli_config.rs @@ -34,33 +34,6 @@ pub struct DrkConfig { pub log_path: String, } -#[derive(Clone, Serialize, Deserialize, Debug)] -pub struct DarkfidConfig { - #[serde(rename = "connect_url")] - pub connect_url: String, - - #[serde(rename = "subscriber_url")] - pub subscriber_url: String, - - #[serde(rename = "cashier_url")] - pub cashier_url: String, - - #[serde(rename = "rpc_url")] - pub rpc_url: String, - - #[serde(rename = "database_path")] - pub database_path: String, - - #[serde(rename = "walletdb_path")] - pub walletdb_path: String, - - #[serde(rename = "log_path")] - pub log_path: String, - - #[serde(rename = "password")] - pub password: String, -} - #[derive(Serialize, Deserialize, Debug)] pub struct GatewaydConfig { #[serde(rename = "connect_url")]