Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-10 15:30:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixup! Create toggleable rendezvous behaviour wrapper

Browse source 
Re-introduce default rendezvous config
This commit is contained in:
rishflab 2021-07-01 13:46:10 +10:00 • committed by Daniel Karzel
parent b19123066d
commit 4194fa39ae
No known key found for this signature in database
GPG key ID: 30C3FC2E438ADB6E
1 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

34
swap/src/asb/config.rs
View file

@ -83,6 +83,13 @@ fn default_asb_data_dir() -> Result<PathBuf> {
.context("Could not generate default config file path") .context("Could not generate default config file path")
} }
// TODO: update this to the actual deployed rendezvous server
// Currently set to Staging ASB on raspi
const DEFAULT_RENDEZVOUS_PEER_ID: &str = "12D3KooWPZ69DRp4wbGB3wJsxxsg1XW1EVZ2evtVwcARCF3a1nrx";
// TODO: update this to the actual deployed rendezvous server
// Port still to be opened once running rendezvous node
const DEFAULT_RENDEZVOUS_ADDR: &str = "/ip4/141.168.172.35/tcp/7654";
const DEFAULT_MIN_BUY_AMOUNT: f64 = 0.002f64; const DEFAULT_MIN_BUY_AMOUNT: f64 = 0.002f64;
const DEFAULT_MAX_BUY_AMOUNT: f64 = 0.02f64; const DEFAULT_MAX_BUY_AMOUNT: f64 = 0.02f64;
const DEFAULT_SPREAD: f64 = 0.02f64; const DEFAULT_SPREAD: f64 = 0.02f64;
@ -297,6 +304,18 @@ pub fn query_user_for_initial_config(testnet: bool) -> Result<Config> {
} }
let ask_spread = Decimal::from_f64(ask_spread).context("Unable to parse spread")?; let ask_spread = Decimal::from_f64(ask_spread).context("Unable to parse spread")?;
let rendezvous_peer_id_str = Input::with_theme(&ColorfulTheme::default())
.with_prompt("Enter the peer id of the rendezvous node you wish to register with")
.default(DEFAULT_RENDEZVOUS_PEER_ID.to_string())
.interact_text()?;
let rendezvous_peer_id = PeerId::from_str(rendezvous_peer_id_str.as_str())?;
let rendezvous_addr_str = Input::with_theme(&ColorfulTheme::default())
.with_prompt("Enter the multiaddress of the rendezvous node you wish to register with")
.default(DEFAULT_RENDEZVOUS_ADDR.to_string())
.interact_text()?;
let rendezvous_addr = Multiaddr::from_str(rendezvous_addr_str.as_str())?;
println!(); println!();
Ok(Config { Ok(Config {
@ -325,7 +344,10 @@ pub fn query_user_for_initial_config(testnet: bool) -> Result<Config> {
ask_spread, ask_spread,
price_ticker_ws_url: defaults.price_ticker_ws_url, price_ticker_ws_url: defaults.price_ticker_ws_url,
}, },
rendezvous: None, rendezvous: Some(Rendezvous {
addr: rendezvous_addr,
peer_id: rendezvous_peer_id,
}),
}) })
} }
@ -367,7 +389,10 @@ mod tests {
ask_spread: Decimal::from_f64(DEFAULT_SPREAD).unwrap(), ask_spread: Decimal::from_f64(DEFAULT_SPREAD).unwrap(),
price_ticker_ws_url: defaults.price_ticker_ws_url, price_ticker_ws_url: defaults.price_ticker_ws_url,
}, },
rendezvous: None, rendezvous: Some(Rendezvous {
addr: DEFAULT_RENDEZVOUS_ADDR.parse().unwrap(),
peer_id: PeerId::from_str(DEFAULT_RENDEZVOUS_PEER_ID).unwrap(),
}),
}; };
initial_setup(config_path.clone(), expected.clone()).unwrap(); initial_setup(config_path.clone(), expected.clone()).unwrap();
@ -409,7 +434,10 @@ mod tests {
ask_spread: Decimal::from_f64(DEFAULT_SPREAD).unwrap(), ask_spread: Decimal::from_f64(DEFAULT_SPREAD).unwrap(),
price_ticker_ws_url: defaults.price_ticker_ws_url, price_ticker_ws_url: defaults.price_ticker_ws_url,
}, },
rendezvous: None, rendezvous: Some(Rendezvous {
addr: DEFAULT_RENDEZVOUS_ADDR.parse().unwrap(),
peer_id: PeerId::from_str(DEFAULT_RENDEZVOUS_PEER_ID).unwrap(),
}),
}; };
initial_setup(config_path.clone(), expected.clone()).unwrap(); initial_setup(config_path.clone(), expected.clone()).unwrap();