Skip to content

Commit

Permalink
improve payment state readability
Browse files Browse the repository at this point in the history
  • Loading branch information
JssDWt committed Oct 11, 2024
1 parent a5ccbf4 commit 47548b7
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions libs/sdk-core/src/greenlight/node_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ use crate::{NodeConfig, PrepareRedeemOnchainFundsRequest, PrepareRedeemOnchainFu

const MAX_PAYMENT_AMOUNT_MSAT: u64 = 4294967000;
const MAX_INBOUND_LIQUIDITY_MSAT: u64 = 4000000000;

const PAYMENT_STATE_PENDING: u8 = 1;
const PAYMENT_STATE_COMPLETE: u8 = 2;
const PAYMENT_STATE_FAILED: u8 = 4;
pub(crate) struct Greenlight {
sdk_config: Config,
signer: Signer,
Expand Down Expand Up @@ -844,15 +846,15 @@ impl Greenlight {
SendPayStatus::Pending => {
add_amount_sent(payment, send_pay.amount_sent_msat, send_pay.amount_msat);
payment.num_nonfailed_parts += 1;
payment.state |= 1;
payment.state |= PAYMENT_STATE_PENDING;
}
SendPayStatus::Failed => {
payment.state |= 4;
payment.state |= PAYMENT_STATE_FAILED;
}
SendPayStatus::Complete => {
add_amount_sent(payment, send_pay.amount_sent_msat, send_pay.amount_msat);
payment.num_nonfailed_parts += 1;
payment.state |= 2;
payment.state |= PAYMENT_STATE_COMPLETE;
}
}
}
Expand Down Expand Up @@ -1981,7 +1983,7 @@ enum NodeCommand {
}

struct SendPayAgg {
state: i32,
state: u8,
created_at: u64,
payment_hash: Vec<u8>,
bolt11: Option<String>,
Expand Down Expand Up @@ -2088,9 +2090,9 @@ impl TryFrom<SendPayAgg> for Payment {
Some(amount) => value.amount_sent.saturating_sub(amount),
None => 0,
};
let status = if value.state & 2 > 0 {
let status = if value.state & PAYMENT_STATE_COMPLETE > 0 {
PaymentStatus::Complete
} else if value.state & 1 > 0 {
} else if value.state & PAYMENT_STATE_PENDING > 0 {
PaymentStatus::Pending
} else {
PaymentStatus::Failed
Expand Down

0 comments on commit 47548b7

Please sign in to comment.