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

Remove multiple occurrences of db initialisation

Browse source
This commit is contained in:
rishflab 2021-09-22 18:02:27 +10:00
parent 7efdb96a50
commit a738c9df8a
1 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
swap/src/bin/swap.rs
View file

@ -54,6 +54,12 @@ async fn main() -> Result<()> {
} }
}; };
let db = Arc::new(
SledDatabase::open(data_dir.join("database").as_path())
.await
.context("Failed to open database")?,
);
match cmd { match cmd {
Command::BuyXmr { Command::BuyXmr {
seller, seller,
@ -67,11 +73,6 @@ async fn main() -> Result<()> {
let swap_id = Uuid::new_v4(); let swap_id = Uuid::new_v4();
cli::tracing::init(debug, json, data_dir.join("logs"), Some(swap_id))?; cli::tracing::init(debug, json, data_dir.join("logs"), Some(swap_id))?;
let db = Arc::new(
SledDatabase::open(data_dir.join("database").as_path())
.await
.context("Failed to open database")?,
);
let seed = Seed::from_file_or_generate(data_dir.as_path()) let seed = Seed::from_file_or_generate(data_dir.as_path())
.context("Failed to read in seed file")?; .context("Failed to read in seed file")?;
@ -143,10 +144,6 @@ async fn main() -> Result<()> {
} }
} }
Command::History => { Command::History => {
let db = SledDatabase::open(data_dir.join("database").as_path())
.await
.context("Failed to open database")?;
let mut table = Table::new(); let mut table = Table::new();
table.set_header(vec!["SWAP ID", "STATE"]); table.set_header(vec!["SWAP ID", "STATE"]);
@ -221,11 +218,6 @@ async fn main() -> Result<()> {
tor_socks5_port, tor_socks5_port,
} => { } => {
cli::tracing::init(debug, json, data_dir.join("logs"), Some(swap_id))?; cli::tracing::init(debug, json, data_dir.join("logs"), Some(swap_id))?;
let db = Arc::new(
SledDatabase::open(data_dir.join("database").as_path())
.await
.context("Failed to open database")?,
);
let seed = Seed::from_file_or_generate(data_dir.as_path()) let seed = Seed::from_file_or_generate(data_dir.as_path())
.context("Failed to read in seed file")?; .context("Failed to read in seed file")?;
@ -287,11 +279,6 @@ async fn main() -> Result<()> {
bitcoin_target_block, bitcoin_target_block,
} => { } => {
cli::tracing::init(debug, json, data_dir.join("logs"), Some(swap_id))?; cli::tracing::init(debug, json, data_dir.join("logs"), Some(swap_id))?;
let db = Arc::new(
SledDatabase::open(data_dir.join("database").as_path())
.await
.context("Failed to open database")?,
);
let seed = Seed::from_file_or_generate(data_dir.as_path()) let seed = Seed::from_file_or_generate(data_dir.as_path())
.context("Failed to read in seed file")?; .context("Failed to read in seed file")?;
@ -313,11 +300,6 @@ async fn main() -> Result<()> {
bitcoin_target_block, bitcoin_target_block,
} => { } => {
cli::tracing::init(debug, json, data_dir.join("logs"), Some(swap_id))?; cli::tracing::init(debug, json, data_dir.join("logs"), Some(swap_id))?;
let db = Arc::new(
SledDatabase::open(data_dir.join("database").as_path())
.await
.context("Failed to open database")?,
);
let seed = Seed::from_file_or_generate(data_dir.as_path()) let seed = Seed::from_file_or_generate(data_dir.as_path())
.context("Failed to read in seed file")?; .context("Failed to read in seed file")?;