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

Include too low balance into Alice's error

Browse Source
This commit is contained in:
Daniel Karzel 2021-05-07 16:12:16 +10:00
parent 1d62f4916c
commit 6d3cf0af91
No known key found for this signature in database
GPG Key ID: 30C3FC2E438ADB6E
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
swap/src/protocol/alice/spot_price.rs
View File

@ -183,7 +183,10 @@ where
let xmr_lock_fees = self.lock_fee; let xmr_lock_fees = self.lock_fee;
if xmr_balance < xmr + xmr_lock_fees { if xmr_balance < xmr + xmr_lock_fees {
self.decline(peer, channel, Error::BalanceTooLow { buy: btc }); self.decline(peer, channel, Error::BalanceTooLow {
balance: xmr_balance,
buy: btc,
});
return; return;
} }
@ -220,8 +223,11 @@ pub enum Error {
max: bitcoin::Amount, max: bitcoin::Amount,
buy: bitcoin::Amount, buy: bitcoin::Amount,
}, },
#[error("This seller's XMR balance is currently too low to fulfill the swap request to buy {buy}, please try again later")] #[error("Balance {balance} too low to fulfill swapping {buy}")]
BalanceTooLow { buy: bitcoin::Amount }, BalanceTooLow {
balance: monero::Amount,
buy: bitcoin::Amount,
},
#[error("Failed to fetch latest rate")] #[error("Failed to fetch latest rate")]
LatestRateFetchFailed(#[source] Box<dyn std::error::Error + Send + 'static>), LatestRateFetchFailed(#[source] Box<dyn std::error::Error + Send + 'static>),
@ -238,7 +244,7 @@ impl Error {
max: *max, max: *max,
buy: *buy, buy: *buy,
}, },
Error::BalanceTooLow { buy } => spot_price::Error::BalanceTooLow { buy: *buy }, Error::BalanceTooLow { buy, .. } => spot_price::Error::BalanceTooLow { buy: *buy },
Error::LatestRateFetchFailed(_) | Error::SellQuoteCalculationFailed(_) => { Error::LatestRateFetchFailed(_) | Error::SellQuoteCalculationFailed(_) => {
spot_price::Error::Other spot_price::Error::Other
} }
@ -296,7 +302,10 @@ mod tests {
test.send_request(request); test.send_request(request);
test.assert_error( test.assert_error(
alice::spot_price::Error::BalanceTooLow { buy: btc_to_swap }, alice::spot_price::Error::BalanceTooLow {
balance: monero::Amount::ZERO,
buy: btc_to_swap,
},
bob::spot_price::Error::BalanceTooLow { buy: btc_to_swap }, bob::spot_price::Error::BalanceTooLow { buy: btc_to_swap },
) )
.await; .await;
@ -323,7 +332,10 @@ mod tests {
test.send_request(request); test.send_request(request);
test.assert_error( test.assert_error(
alice::spot_price::Error::BalanceTooLow { buy: btc_to_swap }, alice::spot_price::Error::BalanceTooLow {
balance: monero::Amount::ZERO,
buy: btc_to_swap,
},
bob::spot_price::Error::BalanceTooLow { buy: btc_to_swap }, bob::spot_price::Error::BalanceTooLow { buy: btc_to_swap },
) )
.await; .await;
@ -331,8 +343,12 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn given_alice_has_insufficient_balance_because_of_lock_fee_then_returns_error() { async fn given_alice_has_insufficient_balance_because_of_lock_fee_then_returns_error() {
let balance = monero::Amount::from_monero(1.0).unwrap();
let mut test = SpotPriceTest::setup( let mut test = SpotPriceTest::setup(
AliceBehaviourValues::default().with_lock_fee(monero::Amount::from_piconero(1)), AliceBehaviourValues::default()
.with_balance(balance)
.with_lock_fee(monero::Amount::from_piconero(1)),
) )
.await; .await;
@ -342,7 +358,10 @@ mod tests {
test.send_request(request); test.send_request(request);
test.assert_error( test.assert_error(
alice::spot_price::Error::BalanceTooLow { buy: btc_to_swap }, alice::spot_price::Error::BalanceTooLow {
balance,
buy: btc_to_swap,
},
bob::spot_price::Error::BalanceTooLow { buy: btc_to_swap }, bob::spot_price::Error::BalanceTooLow { buy: btc_to_swap },
) )
.await; .await;
@ -508,10 +527,19 @@ mod tests {
// TODO: Somehow make PartialEq work on Alice's spot_price::Error // TODO: Somehow make PartialEq work on Alice's spot_price::Error
match (alice_assert, error) { match (alice_assert, error) {
( (
alice::spot_price::Error::BalanceTooLow { .. }, alice::spot_price::Error::BalanceTooLow {
alice::spot_price::Error::BalanceTooLow { .. }, balance: balance1,
) buy: buy1,
| ( },
alice::spot_price::Error::BalanceTooLow {
balance: balance2,
buy: buy2,
},
) => {
assert_eq!(balance1, balance2);
assert_eq!(buy1, buy2);
}
(
alice::spot_price::Error::MaxBuyAmountExceeded { .. }, alice::spot_price::Error::MaxBuyAmountExceeded { .. },
alice::spot_price::Error::MaxBuyAmountExceeded { .. }, alice::spot_price::Error::MaxBuyAmountExceeded { .. },
) )