Remove one tab level when accessing a `peer_state`

[rust-lightning] / lightning / src / ln / outbound_payment.rs

diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
index 60c111b276a0c551df15298b047156a48a4524e3..2f6431665b7ea5ec01bf4a7fe810d0ca9fc1b3c8 100644 (file)
--- a/lightning/src/ln/outbound_payment.rs
+++ b/lightning/src/ln/outbound_payment.rs
@@ -13,7 +13,7 @@ use bitcoin::hashes::Hash;
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::secp256k1::{self, Secp256k1, SecretKey};
 
-use crate::chain::keysinterface::{KeysInterface, Recipient};
+use crate::chain::keysinterface::{EntropySource, KeysInterface, NodeSigner, Recipient};
 use crate::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use crate::ln::channelmanager::{HTLCSource, IDEMPOTENCY_TIMEOUT_TICKS, PaymentId};
 use crate::ln::msgs::DecodeError;
@@ -271,7 +271,7 @@ impl OutboundPayments {
                }
        }
 
-       pub(super) fn send_payment<K: Deref, F>(
+       pub(super) fn send_payment_with_route<K: Deref, F>(
                &self, route: &Route, payment_hash: PaymentHash, payment_secret: &Option<PaymentSecret>,
                payment_id: PaymentId, keys_manager: &K, best_block_height: u32, send_payment_along_path: F
        ) -> Result<(), PaymentSendFailure>
@@ -306,7 +306,7 @@ impl OutboundPayments {
                }
        }
 
-       pub(super) fn retry_payment<K: Deref, F>(
+       pub(super) fn retry_payment_with_route<K: Deref, F>(
                &self, route: &Route, payment_id: PaymentId, keys_manager: &K, best_block_height: u32,
                send_payment_along_path: F
        ) -> Result<(), PaymentSendFailure>
@@ -403,7 +403,15 @@ impl OutboundPayments {
                }
        }
 
-       pub(super) fn add_new_pending_payment<K: Deref>(
+       #[cfg(test)]
+       pub(super) fn test_add_new_pending_payment<K: Deref>(
+               &self, payment_hash: PaymentHash, payment_secret: Option<PaymentSecret>, payment_id: PaymentId,
+               route: &Route, keys_manager: &K, best_block_height: u32
+       ) -> Result<Vec<[u8; 32]>, PaymentSendFailure> where K::Target: KeysInterface {
+               self.add_new_pending_payment(payment_hash, payment_secret, payment_id, route, keys_manager, best_block_height)
+       }
+
+       fn add_new_pending_payment<K: Deref>(
                &self, payment_hash: PaymentHash, payment_secret: Option<PaymentSecret>, payment_id: PaymentId,
                route: &Route, keys_manager: &K, best_block_height: u32
        ) -> Result<Vec<[u8; 32]>, PaymentSendFailure> where K::Target: KeysInterface {
@@ -439,7 +447,8 @@ impl OutboundPayments {
                &self, route: &Route, payment_hash: PaymentHash, payment_secret: &Option<PaymentSecret>,
                keysend_preimage: Option<PaymentPreimage>, payment_id: PaymentId, recv_value_msat: Option<u64>,
                onion_session_privs: Vec<[u8; 32]>, keys_manager: &K, best_block_height: u32,
-               send_payment_along_path: F) -> Result<(), PaymentSendFailure>
+               send_payment_along_path: F
+       ) -> Result<(), PaymentSendFailure>
        where
                K::Target: KeysInterface,
                F: Fn(&Vec<RouteHop>, &Option<PaymentParameters>, &PaymentHash, &Option<PaymentSecret>, u64,
@@ -548,7 +557,8 @@ impl OutboundPayments {
                &self, route: &Route, payment_hash: PaymentHash, payment_secret: &Option<PaymentSecret>,
                keysend_preimage: Option<PaymentPreimage>, payment_id: PaymentId, recv_value_msat: Option<u64>,
                onion_session_privs: Vec<[u8; 32]>, keys_manager: &K, best_block_height: u32,
-               send_payment_along_path: F) -> Result<(), PaymentSendFailure>
+               send_payment_along_path: F
+       ) -> Result<(), PaymentSendFailure>
        where
                K::Target: KeysInterface,
                F: Fn(&Vec<RouteHop>, &Option<PaymentParameters>, &PaymentHash, &Option<PaymentSecret>, u64,
@@ -561,8 +571,8 @@ impl OutboundPayments {
 
        pub(super) fn claim_htlc<L: Deref>(
                &self, payment_id: PaymentId, payment_preimage: PaymentPreimage, session_priv: SecretKey,
-               path: Vec<RouteHop>, from_onchain: bool, pending_events: &Mutex<Vec<events::Event>>, logger: &L)
-        where L::Target: Logger {
+               path: Vec<RouteHop>, from_onchain: bool, pending_events: &Mutex<Vec<events::Event>>, logger: &L
+       ) where L::Target: Logger {
                let mut session_priv_bytes = [0; 32];
                session_priv_bytes.copy_from_slice(&session_priv[..]);
                let mut outbounds = self.pending_outbound_payments.lock().unwrap();
@@ -671,8 +681,8 @@ impl OutboundPayments {
                &self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason,
                path: &Vec<RouteHop>, session_priv: &SecretKey, payment_id: &PaymentId,
                payment_params: &Option<PaymentParameters>, probing_cookie_secret: [u8; 32],
-               secp_ctx: &Secp256k1<secp256k1::All>, pending_events: &Mutex<Vec<events::Event>>, logger: &L)
-       where L::Target: Logger {
+               secp_ctx: &Secp256k1<secp256k1::All>, pending_events: &Mutex<Vec<events::Event>>, logger: &L
+       ) where L::Target: Logger {
                let mut session_priv_bytes = [0; 32];
                session_priv_bytes.copy_from_slice(&session_priv[..]);
                let mut outbounds = self.pending_outbound_payments.lock().unwrap();
@@ -712,9 +722,9 @@ impl OutboundPayments {
                log_trace!(logger, "Failing outbound payment HTLC with payment_hash {}", log_bytes!(payment_hash.0));
 
                let path_failure = {
-       #[cfg(test)]
+                       #[cfg(test)]
                        let (network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data) = onion_error.decode_onion_failure(secp_ctx, logger, &source);
-       #[cfg(not(test))]
+                       #[cfg(not(test))]
                        let (network_update, short_channel_id, payment_retryable, _, _) = onion_error.decode_onion_failure(secp_ctx, logger, &source);
 
                        if payment_is_probe(payment_hash, &payment_id, probing_cookie_secret) {