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

Remove and fix comments

Browse Source
This commit is contained in:
rishflab 2020-12-14 11:56:14 +11:00
parent 6ff440d0cc
commit d8d6477ee9
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swap/src/alice/swap.rs
View File

@ -90,7 +90,7 @@ impl fmt::Display for AliceState {
AliceState::Negotiated { .. } => write!(f, "negotiated"), AliceState::Negotiated { .. } => write!(f, "negotiated"),
AliceState::BtcLocked { .. } => write!(f, "btc_locked"), AliceState::BtcLocked { .. } => write!(f, "btc_locked"),
AliceState::XmrLocked { .. } => write!(f, "xmr_locked"), AliceState::XmrLocked { .. } => write!(f, "xmr_locked"),
AliceState::EncSignLearned { .. } => write!(f, "encsig_learnt"), AliceState::EncSignLearned { .. } => write!(f, "encsig_learned"),
AliceState::BtcRedeemed => write!(f, "btc_redeemed"), AliceState::BtcRedeemed => write!(f, "btc_redeemed"),
AliceState::BtcCancelled { .. } => write!(f, "btc_cancelled"), AliceState::BtcCancelled { .. } => write!(f, "btc_cancelled"),
AliceState::BtcRefunded { .. } => write!(f, "btc_refunded"), AliceState::BtcRefunded { .. } => write!(f, "btc_refunded"),
@ -219,7 +219,7 @@ pub async fn run_until(
.await .await
} }
AliceState::XmrLocked { state3 } => { AliceState::XmrLocked { state3 } => {
// todo: match statement and wait for t1 can probably expressed more cleanly // todo: match statement and wait for t1 can probably be expressed more cleanly
match state3.current_epoch(bitcoin_wallet.as_ref()).await? { match state3.current_epoch(bitcoin_wallet.as_ref()).await? {
Epoch::T0 => { Epoch::T0 => {
let wait_for_enc_sig = wait_for_bitcoin_encrypted_signature( let wait_for_enc_sig = wait_for_bitcoin_encrypted_signature(

3
swap/src/bob/swap.rs
View File

@ -265,7 +265,6 @@ where
BobState::Cancelled(state) => { BobState::Cancelled(state) => {
// Bob has cancelled the swap // Bob has cancelled the swap
match state.current_epoch(bitcoin_wallet.as_ref()).await? { match state.current_epoch(bitcoin_wallet.as_ref()).await? {
// todo: Is this an invalid state?. Should I remove the T0 match branch
Epoch::T0 => panic!("Cancelled before t1??? Something is really wrong"), Epoch::T0 => panic!("Cancelled before t1??? Something is really wrong"),
Epoch::T1 => { Epoch::T1 => {
state.refund_btc(bitcoin_wallet.as_ref()).await?; state.refund_btc(bitcoin_wallet.as_ref()).await?;
@ -282,8 +281,6 @@ where
.await .await
} }
Epoch::T2 => { Epoch::T2 => {
// todo: If t2 has elapsed should we check whether Alice has punished? If
// not can we still refund?
run_until( run_until(
BobState::Punished, BobState::Punished,
is_target_state, is_target_state,