Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-06-28 23:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create means creating the current wallet

Browse Source
This commit is contained in:
Daniel Karzel 2021-03-02 19:38:07 +11:00
parent 5b798217bc
commit 70494fcb4f
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swap/src/bin/asb.rs
View File

@ -167,14 +167,11 @@ async fn init_wallets(
// Setup the Monero wallet
let open_wallet_response = monero_wallet.open().await;
if open_wallet_response.is_err() {
monero_wallet
.create_wallet(DEFAULT_WALLET_NAME)
.await
.context(format!(
"Unable to create Monero wallet.\
monero_wallet.create().await.context(format!(
"Unable to create Monero wallet.\
Please ensure that the monero-wallet-rpc is available at {}",
config.monero.wallet_rpc_url
))?;
config.monero.wallet_rpc_url
))?;
info!("Created Monero wallet {}", DEFAULT_WALLET_NAME);
} else {

11
swap/src/bin/swap_cli.rs
View File

@ -295,14 +295,11 @@ async fn init_monero_wallet(
// Setup the temporary Monero wallet necessary for monitoring the blockchain
let open_monitoring_wallet_response = monero_wallet.open().await;
if open_monitoring_wallet_response.is_err() {
monero_wallet
.create_wallet(MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME)
.await
.context(format!(
"Unable to create Monero wallet for blockchain monitoring.\
monero_wallet.create().await.context(format!(
"Unable to create Monero wallet for blockchain monitoring.\
Please ensure that the monero-wallet-rpc is available at {}",
monero_wallet_rpc_url
))?;
monero_wallet_rpc_url
))?;
debug!(
"Created Monero wallet for blockchain monitoring with name {}",

2
swap/src/monero.rs
View File

@ -245,7 +245,7 @@ pub trait OpenWallet {
#[async_trait]
pub trait CreateWallet {
async fn create_wallet(&self, file_name: &str) -> Result<()>;
async fn create(&self) -> Result<()>;
}
#[async_trait]

8
swap/src/monero/wallet.rs
View File

@ -178,8 +178,12 @@ impl OpenWallet for Wallet {
#[async_trait]
impl CreateWallet for Wallet {
async fn create_wallet(&self, file_name: &str) -> Result<()> {
self.inner.lock().await.create_wallet(file_name).await?;
async fn create(&self) -> Result<()> {
self.inner
.lock()
.await
.create_wallet(self.default_wallet_name.as_str())
.await?;
Ok(())
}
}