From 8cde7e8db9b7a4084bd47d506d039b7decdd8c41 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 30 Apr 2021 17:32:36 +0000 Subject: [PATCH] Fix merge conflicts between #898 and #895. --- lightning-invoice/src/utils.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lightning-invoice/src/utils.rs b/lightning-invoice/src/utils.rs index b90aad82..20247ed3 100644 --- a/lightning-invoice/src/utils.rs +++ b/lightning-invoice/src/utils.rs @@ -108,7 +108,7 @@ mod test { let _chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()); let invoice = ::utils::create_invoice_from_channelmanager(&nodes[1].node, nodes[1].keys_manager, Currency::BitcoinTestnet, Some(10_000), "test".to_string()).unwrap(); assert_eq!(invoice.amount_pico_btc(), Some(100_000)); - assert_eq!(invoice.min_final_cltv_expiry(), Some(9)); + assert_eq!(invoice.min_final_cltv_expiry(), 9); assert_eq!(invoice.description(), InvoiceDescription::Direct(&Description("test".to_string()))); let mut route_hints = invoice.routes().clone(); @@ -129,7 +129,7 @@ mod test { Some(&first_hops.iter().collect::>()), &last_hops.iter().collect::>(), amt_msat, - invoice.min_final_cltv_expiry().unwrap() as u32, + invoice.min_final_cltv_expiry() as u32, &logger, ).unwrap(); -- 2.30.2