github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

ircd, taud: explicit Url type in structopt

Browse Source
This commit is contained in:
ghassmo
2022-06-10 16:30:33 +03:00
parent 1750fd5429
commit 4e636d2f67
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/ircd/src/main.rs
View File

@@ -12,7 +12,6 @@ use log::{debug, error, info, warn};
use rand::rngs::OsRng;
use smol::future;
use structopt_toml::StructOptToml;
use url::Url;
use darkfi::{
async_daemonize, net,
@@ -202,7 +201,7 @@ async fn realmain(settings: Args, executor: Arc<Executor<'_>>) -> Result<()> {
//
// RPC interface
//
let rpc_listen_addr = Url::parse(&settings.rpc_listen)?;
let rpc_listen_addr = settings.rpc_listen.clone();
let rpc_interface =
Arc::new(JsonRpcInterface { addr: rpc_listen_addr.clone(), p2p: p2p.clone() });
let rpc_task =

2
bin/ircd/src/settings.rs
View File

@@ -27,7 +27,7 @@ pub struct Args {
/// JSON-RPC listen URL
#[structopt(long = "rpc", default_value = "tcp://127.0.0.1:11055")]
pub rpc_listen: String,
pub rpc_listen: Url,
/// IRC listen URL
#[structopt(long = "irc", default_value = "tcp://127.0.0.1:11066")]

4
bin/tau/taud/src/main.rs
View File

@@ -7,7 +7,6 @@ use futures::{select, FutureExt};
use log::{debug, error, info, warn};
use smol::future;
use structopt_toml::StructOptToml;
use url::Url;
use darkfi::{
async_daemonize, net,
@@ -130,9 +129,8 @@ async fn realmain(settings: Args, executor: Arc<Executor<'_>>) -> Result<()> {
Arc::new(JsonRpcInterface::new(rpc_snd, datastore_path.clone(), nickname.unwrap()));
let executor_cloned = executor.clone();
let rpc_listener_url = Url::parse(&settings.rpc_listen)?;
let rpc_listener_task =
executor_cloned.spawn(listen_and_serve(rpc_listener_url, rpc_interface));
executor_cloned.spawn(listen_and_serve(settings.rpc_listen.clone(), rpc_interface));
let net_settings = settings.net;

3
bin/tau/taud/src/settings.rs
View File

@@ -1,6 +1,7 @@
use serde::Deserialize;
use structopt::StructOpt;
use structopt_toml::StructOptToml;
use url::Url;
use darkfi::net::settings::SettingsOpt;
@@ -17,7 +18,7 @@ pub struct Args {
pub config: Option<String>,
/// JSON-RPC listen URL
#[structopt(long = "rpc", default_value = "tcp://127.0.0.1:11055")]
pub rpc_listen: String,
pub rpc_listen: Url,
/// Sets Datastore Path
#[structopt(long, default_value = "~/.config/tau")]
pub datastore: String,