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

work in review comments

Browse Source
This commit is contained in:
Daniel Karzel 2021-02-04 10:43:02 +11:00
parent c930ad84a4
commit 86290649e7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swap/src/main.rs
View File

@ -29,7 +29,7 @@ use protocol::{alice, bob, bob::Builder, SwapAmounts};
use std::{path::PathBuf, sync::Arc};
use structopt::StructOpt;
use trace::init_tracing;
use tracing::info;
use tracing::{error, info, warn};
use uuid::Uuid;
pub mod bitcoin;
@ -247,11 +247,12 @@ async fn main() -> Result<()> {
Ok((txid, _)) => {
info!("Cancel transaction successfully published with id {}", txid)
}
Err(CancelError::CancelTimelockNotExpiredYet) => {
info!("The Cancel Transaction cannot be published yet, because the timelock has not expired. Please try again later.")
}
Err(CancelError::CancelTimelockNotExpiredYet) => error!(
"The Cancel Transaction cannot be published yet, \
because the timelock has not expired. Please try again later."
),
Err(CancelError::CancelTxAlreadyPublished) => {
info!("The Cancel Transaction has already been published.")
warn!("The Cancel Transaction has already been published.")
}
}
}

4
swap/tests/bob_refunds_using_cancel_and_refund_command_timelock_not_exired.rs
View File

@ -19,7 +19,7 @@ async fn given_bob_manually_cancels_when_timelock_not_expired_errors() {
let (bob_swap, bob_join_handle) = ctx.stop_and_resume_bob_from_db(bob_join_handle).await;
assert!(matches!(bob_swap.state, BobState::BtcLocked { .. }));
// Bob manually cancels
// Bob tries but fails to manually cancel
let result = bob::cancel(
bob_swap.swap_id,
bob_swap.state,
@ -37,7 +37,7 @@ async fn given_bob_manually_cancels_when_timelock_not_expired_errors() {
let (bob_swap, bob_join_handle) = ctx.stop_and_resume_bob_from_db(bob_join_handle).await;
assert!(matches!(bob_swap.state, BobState::BtcLocked { .. }));
// Bob manually refunds
// Bob tries but fails to manually refund
bob::refund(
bob_swap.swap_id,
bob_swap.state,