Upgrade LDK to 0.0.118

[ldk-sample] / src / cli.rs

diff --git a/src/cli.rs b/src/cli.rs
index 9cb0f174fa70b3be67d13c4438e2bc011554dcb4..297900a0db7cf15b6ce59480336a91afaefe0bba 100644 (file)
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -12,7 +12,7 @@ use lightning::ln::channelmanager::{PaymentId, RecipientOnionFields, Retry};
 use lightning::ln::msgs::SocketAddress;
 use lightning::ln::{ChannelId, PaymentHash, PaymentPreimage};
 use lightning::onion_message::OnionMessagePath;
-use lightning::onion_message::{CustomOnionMessageContents, Destination, OnionMessageContents};
+use lightning::onion_message::{Destination, OnionMessageContents};
 use lightning::routing::gossip::NodeId;
 use lightning::routing::router::{PaymentParameters, RouteParameters};
 use lightning::sign::{EntropySource, KeysManager};
@@ -48,7 +48,7 @@ struct UserOnionMessageContents {
        data: Vec<u8>,
 }
 
-impl CustomOnionMessageContents for UserOnionMessageContents {
+impl OnionMessageContents for UserOnionMessageContents {
        fn tlv_type(&self) -> u64 {
                self.tlv_type
        }
@@ -65,7 +65,7 @@ pub(crate) fn poll_for_user_input(
        keys_manager: Arc<KeysManager>, network_graph: Arc<NetworkGraph>,
        onion_messenger: Arc<OnionMessenger>, inbound_payments: Arc<Mutex<PaymentInfoStorage>>,
        outbound_payments: Arc<Mutex<PaymentInfoStorage>>, ldk_data_dir: String, network: Network,
-       logger: Arc<disk::FilesystemLogger>, persister: Arc<FilesystemStore>,
+       logger: Arc<disk::FilesystemLogger>, fs_store: Arc<FilesystemStore>,
 ) {
        println!(
                "LDK startup successful. Enter \"help\" to view available commands. Press Ctrl-D to quit."
@@ -172,7 +172,7 @@ pub(crate) fn poll_for_user_input(
                                                &channel_manager,
                                                &invoice,
                                                &mut outbound_payments.lock().unwrap(),
-                                               persister.clone(),
+                                               Arc::clone(&fs_store),
                                        );
                                }
                                "keysend" => {
@@ -209,7 +209,7 @@ pub(crate) fn poll_for_user_input(
                                                amt_msat,
                                                &*keys_manager,
                                                &mut outbound_payments.lock().unwrap(),
-                                               persister.clone(),
+                                               Arc::clone(&fs_store),
                                        );
                                }
                                "getinvoice" => {
@@ -247,7 +247,7 @@ pub(crate) fn poll_for_user_input(
                                                expiry_secs.unwrap(),
                                                Arc::clone(&logger),
                                        );
-                                       persister
+                                       fs_store
                                                .write("", "", INBOUND_PAYMENTS_FNAME, &inbound_payments.encode())
                                                .unwrap();
                                }
@@ -445,7 +445,7 @@ pub(crate) fn poll_for_user_input(
                                        let message_path = OnionMessagePath { intermediate_nodes, destination };
                                        match onion_messenger.send_onion_message(
                                                message_path,
-                                               OnionMessageContents::Custom(UserOnionMessageContents { tlv_type, data }),
+                                               UserOnionMessageContents { tlv_type, data },
                                                None,
                                        ) {
                                                Ok(()) => println!("SUCCESS: forwarded onion message to first hop"),
@@ -684,7 +684,7 @@ fn open_channel(
 
 fn send_payment(
        channel_manager: &ChannelManager, invoice: &Bolt11Invoice,
-       outbound_payments: &mut PaymentInfoStorage, persister: Arc<FilesystemStore>,
+       outbound_payments: &mut PaymentInfoStorage, fs_store: Arc<FilesystemStore>,
 ) {
        let payment_hash = PaymentHash((*invoice.payment_hash()).into_inner());
        let payment_secret = Some(*invoice.payment_secret());
@@ -697,7 +697,7 @@ fn send_payment(
                        amt_msat: MillisatAmount(invoice.amount_milli_satoshis()),
                },
        );
-       persister.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
+       fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
        match pay_invoice(invoice, Retry::Timeout(Duration::from_secs(10)), channel_manager) {
                Ok(_payment_id) => {
                        let payee_pubkey = invoice.recover_payee_pub_key();
@@ -709,14 +709,14 @@ fn send_payment(
                        println!("ERROR: failed to send payment: {:?}", e);
                        print!("> ");
                        outbound_payments.payments.get_mut(&payment_hash).unwrap().status = HTLCStatus::Failed;
-                       persister.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
+                       fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
                }
        };
 }
 
 fn keysend<E: EntropySource>(
        channel_manager: &ChannelManager, payee_pubkey: PublicKey, amt_msat: u64, entropy_source: &E,
-       outbound_payments: &mut PaymentInfoStorage, persister: Arc<FilesystemStore>,
+       outbound_payments: &mut PaymentInfoStorage, fs_store: Arc<FilesystemStore>,
 ) {
        let payment_preimage = PaymentPreimage(entropy_source.get_secure_random_bytes());
        let payment_hash = PaymentHash(Sha256::hash(&payment_preimage.0[..]).into_inner());
@@ -734,7 +734,7 @@ fn keysend<E: EntropySource>(
                        amt_msat: MillisatAmount(Some(amt_msat)),
                },
        );
-       persister.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
+       fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
        match channel_manager.send_spontaneous_payment_with_retry(
                Some(payment_preimage),
                RecipientOnionFields::spontaneous_empty(),
@@ -750,7 +750,7 @@ fn keysend<E: EntropySource>(
                        println!("ERROR: failed to send payment: {:?}", e);
                        print!("> ");
                        outbound_payments.payments.get_mut(&payment_hash).unwrap().status = HTLCStatus::Failed;
-                       persister.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
+                       fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
                }
        };
 }