aljaz/breez-sdk-liquid
1
0
Fork 0
mirror of https://github.com/aljazceru/breez-sdk-liquid.git synced 2026-01-08 08:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from breez/ok300-simplify-range-validation

Browse Source 
Simplify range validation
This commit is contained in:
ok300
2024-03-18 16:14:57 +00:00
committed by GitHub
parent f9d16c71ee 682b45bc8f
commit cace61e41e
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/src/wallet.rs
View File

@@ -185,21 +185,17 @@ impl Wallet {
.parse::<Bolt11Invoice>()
.map_err(|_| SwapError::InvalidInvoice)?;
let pairs = client.get_pairs()?;
let lbtc_pair = pairs.get_lbtc_pair()?;
let lbtc_pair = client.get_pairs()?.get_lbtc_pair()?;
let amount_sat = invoice
.amount_milli_satoshis()
.ok_or(SwapError::AmountOutOfRange)?
/ 1000;
if lbtc_pair.limits.minimal > amount_sat as i64 {
return Err(SwapError::AmountOutOfRange);
}
if lbtc_pair.limits.maximal < amount_sat as i64 {
return Err(SwapError::AmountOutOfRange);
}
lbtc_pair
.limits
.within(amount_sat)
.map_err(|_| SwapError::AmountOutOfRange)?;
let swap_response = client.create_swap(CreateSwapRequest::new_lbtc_submarine(
&lbtc_pair.hash,
@@ -270,17 +266,12 @@ impl Wallet {
pub fn receive_payment(&self, amount_sat: u64) -> Result<SwapLbtcResponse, SwapError> {
let client = self.boltz_client();
let pairs = client.get_pairs()?;
let lbtc_pair = client.get_pairs()?.get_lbtc_pair()?;
let lbtc_pair = pairs.get_lbtc_pair()?;
if lbtc_pair.limits.minimal > amount_sat as i64 {
return Err(SwapError::AmountOutOfRange);
}
if lbtc_pair.limits.maximal < amount_sat as i64 {
return Err(SwapError::AmountOutOfRange);
}
lbtc_pair
.limits
.within(amount_sat)
.map_err(|_| SwapError::AmountOutOfRange)?;
let mnemonic = self.signer.mnemonic();
let swap_key =
@@ -320,7 +311,7 @@ impl Wallet {
lockup_address,
blinding_str,
preimage: preimage.to_string().unwrap(),
absolute_fees: CLAIM_ABSOLUTE_FEES
absolute_fees: CLAIM_ABSOLUTE_FEES,
};
self.pending_claims