bin/drk: use UrlConfig & cargo fmt

bin/darkfid/src/main.rs

@@ -51,7 +51,6 @@ pub struct CashierC {
     pub rpc_url: UrlConfig,
 }
 
-
 /// The configuration for darkfid
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct DarkfidConfig {
@@ -66,14 +65,13 @@ pub struct DarkfidConfig {
     /// The address where darkfid should bind its RPC socket
     pub rpc_listener_url: UrlConfig,
     /// The endpoint to a gatewayd protocol API
-    pub gateway_url: UrlConfig ,
+    pub gateway_url: UrlConfig,
     /// The endpoint to a gatewayd publisher API
-    pub gateway_pub_url: UrlConfig ,
+    pub gateway_pub_url: UrlConfig,
     /// The configured cashiers to use
     pub cashiers: Vec<CashierC>,
 }
 
-
 /// Darkfid cli
 #[derive(Parser)]
 #[clap(name = "darkfid")]
@@ -817,7 +815,10 @@ async fn start(
 
     let client = Client::new(
         rocks.clone(),
-        (Url::try_from(config.gateway_url.clone())?, Url::try_from(config.gateway_pub_url.clone())?),
+        (
+            Url::try_from(config.gateway_url.clone())?,
+            Url::try_from(config.gateway_pub_url.clone())?,
+        ),
         wallet.clone(),
     )
     .await?;

bin/drk/drk_config.toml

@@ -4,5 +4,6 @@
 ## your client properly.
 
 # The RPC endpoint where darkfid is listening on
-darkfid_rpc_url = "tcp://127.0.0.1:8000"
-#darkfid_rpc_url = "tls://127.0.0.1:8000"
+[darkfid_rpc_url] 
+url = "tcp://127.0.0.1:8000"
+#url = "tls://127.0.0.1:8000"

bin/drk/src/main.rs

@@ -11,7 +11,7 @@ use url::Url;
 use darkfi::{
     rpc::{jsonrpc, jsonrpc::JsonResult},
     util::{
-        cli::{log_config, spawn_config, Config},
+        cli::{log_config, spawn_config, Config, UrlConfig},
         join_config_path,
         path::expand_path,
         NetworkName,
@@ -23,7 +23,7 @@ use darkfi::{
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct DrkConfig {
     /// The URL where darkfid RPC is listening on
-    pub darkfid_rpc_url: String,
+    pub darkfid_rpc_url: UrlConfig,
 }
 
 #[derive(Subcommand)]
@@ -302,7 +302,7 @@ impl Drk {
 }
 
 async fn start(config: &DrkConfig, options: CliDrk) -> Result<()> {
-    let client = Drk::new(Url::parse(&config.darkfid_rpc_url)?);
+    let client = Drk::new(Url::try_from(config.darkfid_rpc_url.clone())?);
 
     match options.command {
         Some(CliDrkSubCommands::Hello {}) => {

src/util/cli.rs

@@ -6,7 +6,7 @@ use std::{
     str,
 };
 
-use serde::{de::DeserializeOwned, Serialize, Deserialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use simplelog::ConfigBuilder;
 
 use crate::{Error, Result};
@@ -84,7 +84,7 @@ pub struct UrlConfig {
 impl TryFrom<UrlConfig> for url::Url {
     type Error = url::ParseError;
 
-    // TODO remove unwraps 
+    // TODO remove unwraps
     fn try_from(urlc: UrlConfig) -> std::result::Result<Self, Self::Error> {
         let mut url = url::Url::parse(&urlc.url)?;