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

Rename ExecutionParams to EnvironmentConfig

Browse source
This commit is contained in:
Thomas Eizinger 2021-03-17 14:55:42 +11:00
parent bc43ed6ebd
commit 09c41f89c4
No known key found for this signature in database
GPG key ID: 651AC83A6C6C8B96
14 changed files with 132 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

8
swap/src/bitcoin/wallet.rs
View file

@ -1,6 +1,6 @@
use crate::bitcoin::timelocks::BlockHeight;
use crate::bitcoin::{Address, Amount, Transaction};
use crate::execution_params::ExecutionParams;
use crate::env::Config;
use ::bitcoin::util::psbt::PartiallySignedTransaction;
use ::bitcoin::Txid;
use anyhow::{anyhow, bail, Context, Result};
@ -33,7 +33,7 @@ impl Wallet {
electrum_rpc_url: Url,
wallet_dir: &Path,
key: impl DerivableKey<Segwitv0> + Clone,
exec_params: ExecutionParams,
env_config: Config,
) -> Result<Self> {
// Workaround for https://github.com/bitcoindevkit/rust-electrum-client/issues/47.
let config = electrum_client::ConfigBuilder::default().retry(2).build();
@ -47,7 +47,7 @@ impl Wallet {
let bdk_wallet = bdk::Wallet::new(
bdk::template::BIP84(key.clone(), KeychainKind::External),
Some(bdk::template::BIP84(key, KeychainKind::Internal)),
exec_params.bitcoin_network,
env_config.bitcoin_network,
db,
ElectrumBlockchain::from(client),
)?;
@ -60,7 +60,7 @@ impl Wallet {
Ok(Self {
wallet: Arc::new(Mutex::new(bdk_wallet)),
client: Arc::new(Mutex::new(Client::new(electrum, interval)?)),
finality_confirmations: exec_params.bitcoin_finality_confirmations,
finality_confirmations: env_config.bitcoin_finality_confirmations,
})
}