aljaz/sphinx-key
1
1
Fork 0
mirror of https://github.com/stakwork/sphinx-key.git synced 2025-12-17 15:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Grab network from environment, not cli

Browse Source
This commit is contained in:
decentclock
2022-08-24 18:20:20 +00:00
parent e830a68466
commit 0fd1d06b51
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
broker/src/main.rs
View File

@@ -12,6 +12,7 @@ use crate::unix_fd::SignerLoop;
use bitcoin::Network; use bitcoin::Network;
use clap::{App, AppSettings, Arg}; use clap::{App, AppSettings, Arg};
use std::env; use std::env;
use std::str::FromStr;
use std::sync::Arc; use std::sync::Arc;
use tokio::sync::{mpsc, oneshot}; use tokio::sync::{mpsc, oneshot};
use url::Url; use url::Url;
@@ -51,12 +52,6 @@ fn main() -> anyhow::Result<()> {
.long("dev-disconnect") .long("dev-disconnect")
.takes_value(true), .takes_value(true),
) )
.arg(
Arg::new("network")
.about("Bitcoin network the broker will run on")
.long("network")
.default_value("regtest"),
)
.arg(Arg::from("--log-io ignored dev flag")) .arg(Arg::from("--log-io ignored dev flag"))
.arg(Arg::from("--version show a dummy version")) .arg(Arg::from("--version show a dummy version"))
.arg(Arg::from("--test run a test against the embedded device")); .arg(Arg::from("--test run a test against the embedded device"));
@@ -76,16 +71,11 @@ fn main() -> anyhow::Result<()> {
return Ok(()); return Ok(());
} }
let mut network = Network::Regtest; let network = Network::from_str(
if let Some(network_arg) = matches.value_of("network") { &env::var("VLS_NETWORK")
network = match network_arg { .expect("Please set the env var VLS_NETWORK to either bitcoin or regtest"),
"bitcoin" => Network::Bitcoin, )
"mainnet" => Network::Bitcoin, .expect("The env var VLS_NETWORK isn't set to bitcoin or regtest");
"testnet" => Network::Testnet,
"signet" => Network::Signet,
_ => Network::Regtest,
};
};
let (tx, rx) = mpsc::channel(1000); let (tx, rx) = mpsc::channel(1000);
let (status_tx, mut status_rx) = mpsc::channel(1000); let (status_tx, mut status_rx) = mpsc::channel(1000);