Skip to content

Commit 9560ed0

Browse files
committed
f - consolidate Quantity initialization
1 parent 391e4c2 commit 9560ed0

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

lightning/src/offers/offer.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -439,15 +439,6 @@ impl Quantity {
439439
Quantity::Bounded(NonZeroU64::new(1).unwrap())
440440
}
441441

442-
fn new(quantity: Option<u64>) -> Self {
443-
match quantity {
444-
None => Quantity::one(),
445-
Some(0) => Quantity::Unbounded,
446-
Some(1) => unreachable!(),
447-
Some(n) => Quantity::Bounded(NonZeroU64::new(n).unwrap()),
448-
}
449-
}
450-
451442
fn to_tlv_record(&self) -> Option<u64> {
452443
match self {
453444
Quantity::Bounded(n) => {
@@ -529,8 +520,10 @@ impl TryFrom<OfferTlvStream> for OfferContents {
529520
};
530521

531522
let supported_quantity = match quantity_max {
523+
None => Quantity::one(),
524+
Some(0) => Quantity::Unbounded,
532525
Some(1) => return Err(SemanticError::InvalidQuantity),
533-
_ => Quantity::new(quantity_max),
526+
Some(n) => Quantity::Bounded(NonZeroU64::new(n).unwrap()),
534527
};
535528

536529
if node_id.is_none() {

0 commit comments

Comments
 (0)