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

Don't repeat the module name within the type

Browse Source
This commit is contained in:
Thomas Eizinger 2021-03-04 17:02:03 +11:00
parent 87f928f56c
commit 5953037b81
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ use swap::database::Database;
use swap::execution_params::GetExecutionParams; use swap::execution_params::GetExecutionParams;
use swap::network::quote::BidQuote; use swap::network::quote::BidQuote;
use swap::protocol::bob; use swap::protocol::bob;
use swap::protocol::bob::cancel::CancelError;
use swap::protocol::bob::{Builder, EventLoop}; use swap::protocol::bob::{Builder, EventLoop};
use swap::seed::Seed; use swap::seed::Seed;
use swap::{bitcoin, execution_params, monero}; use swap::{bitcoin, execution_params, monero};
@ -213,11 +212,11 @@ async fn main() -> Result<()> {
Ok((txid, _)) => { Ok((txid, _)) => {
debug!("Cancel transaction successfully published with id {}", txid) debug!("Cancel transaction successfully published with id {}", txid)
} }
Err(CancelError::CancelTimelockNotExpiredYet) => error!( Err(bob::cancel::Error::CancelTimelockNotExpiredYet) => error!(
"The Cancel Transaction cannot be published yet, \ "The Cancel Transaction cannot be published yet, \
because the timelock has not expired. Please try again later." because the timelock has not expired. Please try again later."
), ),
Err(CancelError::CancelTxAlreadyPublished) => { Err(bob::cancel::Error::CancelTxAlreadyPublished) => {
warn!("The Cancel Transaction has already been published.") warn!("The Cancel Transaction has already been published.")
} }
} }

8
swap/src/protocol/bob/cancel.rs
View File

@ -6,7 +6,7 @@ use std::sync::Arc;
use uuid::Uuid; use uuid::Uuid;
#[derive(Debug, thiserror::Error, Clone, Copy)] #[derive(Debug, thiserror::Error, Clone, Copy)]
pub enum CancelError { pub enum Error {
#[error("The cancel timelock has not expired yet.")] #[error("The cancel timelock has not expired yet.")]
CancelTimelockNotExpiredYet, CancelTimelockNotExpiredYet,
#[error("The cancel transaction has already been published.")] #[error("The cancel transaction has already been published.")]
@ -19,7 +19,7 @@ pub async fn cancel(
bitcoin_wallet: Arc<Wallet>, bitcoin_wallet: Arc<Wallet>,
db: Database, db: Database,
force: bool, force: bool,
) -> Result<Result<(Txid, BobState), CancelError>> { ) -> Result<Result<(Txid, BobState), Error>> {
let state4 = match state { let state4 = match state {
BobState::BtcLocked(state3) => state3.cancel(), BobState::BtcLocked(state3) => state3.cancel(),
BobState::XmrLockProofReceived { state, .. } => state.cancel(), BobState::XmrLockProofReceived { state, .. } => state.cancel(),
@ -35,7 +35,7 @@ pub async fn cancel(
if !force { if !force {
if let ExpiredTimelocks::None = state4.expired_timelock(bitcoin_wallet.as_ref()).await? { if let ExpiredTimelocks::None = state4.expired_timelock(bitcoin_wallet.as_ref()).await? {
return Ok(Err(CancelError::CancelTimelockNotExpiredYet)); return Ok(Err(Error::CancelTimelockNotExpiredYet));
} }
if state4 if state4
@ -47,7 +47,7 @@ pub async fn cancel(
let db_state = state.into(); let db_state = state.into();
db.insert_latest_state(swap_id, Swap::Bob(db_state)).await?; db.insert_latest_state(swap_id, Swap::Bob(db_state)).await?;
return Ok(Err(CancelError::CancelTxAlreadyPublished)); return Ok(Err(Error::CancelTxAlreadyPublished));
} }
} }

4
swap/tests/bob_refunds_using_cancel_and_refund_command_timelock_not_expired.rs
View File

@ -1,6 +1,6 @@
pub mod testutils; pub mod testutils;
use bob::cancel::CancelError; use bob::cancel::Error;
use swap::protocol::bob; use swap::protocol::bob;
use swap::protocol::bob::BobState; use swap::protocol::bob::BobState;
use testutils::bob_run_until::is_btc_locked; use testutils::bob_run_until::is_btc_locked;
@ -30,7 +30,7 @@ async fn given_bob_manually_cancels_when_timelock_not_expired_errors() {
.err() .err()
.unwrap(); .unwrap();
assert!(matches!(result, CancelError::CancelTimelockNotExpiredYet)); assert!(matches!(result, Error::CancelTimelockNotExpiredYet));
let (bob_swap, bob_join_handle) = ctx.stop_and_resume_bob_from_db(bob_join_handle).await; let (bob_swap, bob_join_handle) = ctx.stop_and_resume_bob_from_db(bob_join_handle).await;
assert!(matches!(bob_swap.state, BobState::BtcLocked { .. })); assert!(matches!(bob_swap.state, BobState::BtcLocked { .. }));