mirror of
https://github.com/stakwork/sphinx-key.git
synced 2025-12-19 00:04:25 +01:00
merge master
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
#![feature(once_cell)]
|
||||
mod chain_tracker;
|
||||
mod init;
|
||||
mod mqtt;
|
||||
mod run_test;
|
||||
mod unix_fd;
|
||||
@@ -9,10 +8,9 @@ mod util;
|
||||
use crate::chain_tracker::MqttSignerPort;
|
||||
use crate::mqtt::start_broker;
|
||||
use crate::unix_fd::SignerLoop;
|
||||
use bitcoin::Network;
|
||||
use crate::util::read_broker_config;
|
||||
use clap::{App, AppSettings, Arg};
|
||||
use std::env;
|
||||
use std::str::FromStr;
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::{mpsc, oneshot};
|
||||
use url::Url;
|
||||
@@ -39,6 +37,8 @@ pub struct ChannelReply {
|
||||
pub reply: Vec<u8>,
|
||||
}
|
||||
|
||||
const BROKER_CONFIG_PATH: &str = "../broker.conf";
|
||||
|
||||
fn main() -> anyhow::Result<()> {
|
||||
let parent_fd = open_parent_fd();
|
||||
|
||||
@@ -71,17 +71,12 @@ fn main() -> anyhow::Result<()> {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let net_var = env::var("VLS_NETWORK").unwrap_or("regtest".to_string());
|
||||
let net_var = match net_var.as_str() {
|
||||
ret @ ("bitcoin" | "regtest") => ret,
|
||||
_ => panic!("Please set VLS_NETWORK to either 'bitcoin' or 'regtest'"),
|
||||
};
|
||||
let network = Network::from_str(net_var).unwrap();
|
||||
let settings = read_broker_config(BROKER_CONFIG_PATH);
|
||||
|
||||
let (tx, rx) = mpsc::channel(1000);
|
||||
let (status_tx, mut status_rx) = mpsc::channel(1000);
|
||||
log::info!("=> start broker on network: {}", network);
|
||||
let runtime = start_broker(rx, status_tx, "sphinx-1");
|
||||
log::info!("=> start broker on network: {}", settings.network);
|
||||
let runtime = start_broker(rx, status_tx, "sphinx-1", &settings);
|
||||
log::info!("=> wait for connected status");
|
||||
// wait for connection = true
|
||||
let status = status_rx.blocking_recv().expect("couldnt receive");
|
||||
@@ -94,7 +89,7 @@ fn main() -> anyhow::Result<()> {
|
||||
let frontend = Frontend::new(
|
||||
Arc::new(SignerPortFront {
|
||||
signer_port: Box::new(signer_port),
|
||||
network,
|
||||
network: settings.network,
|
||||
}),
|
||||
Url::parse(&btc_url).expect("malformed btc rpc url"),
|
||||
);
|
||||
@@ -107,7 +102,7 @@ fn main() -> anyhow::Result<()> {
|
||||
let client = UnixClient::new(conn);
|
||||
// TODO pass status_rx into SignerLoop
|
||||
let mut signer_loop = SignerLoop::new(client, tx);
|
||||
signer_loop.start();
|
||||
signer_loop.start(Some(&settings));
|
||||
// })
|
||||
|
||||
Ok(())
|
||||
|
||||
Reference in New Issue
Block a user