Merge pull request #1916 from valentinewallace/2022-11-chanman-payment-retries

`ChannelManager` Payment Retries

diff --cc lightning/src/ln/channelmanager.rs
index f99e4cf6ba5746f319f41c3638c1cfdb2db3f29d,21fba77879194bf82d025a0a1e7f04813e4c25b8..b2a23c7c1d44cbdf03137263c663acaa285774c1
--- 1/lightning/src/ln/channelmanager.rs
--- 2/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@@ -53,9 -53,9 +53,9 @@@ use crate::ln::onion_utils::HTLCFailRea
  use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VALUE_MSAT};
  #[cfg(test)]
  use crate::ln::outbound_payment;
- use crate::ln::outbound_payment::{OutboundPayments, PendingOutboundPayment};
+ use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment, Retry};
  use crate::ln::wire::Encode;
 -use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, Sign, SignerProvider};
 +use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
  use crate::util::config::{UserConfig, ChannelConfig};
  use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
  use crate::util::events;

diff --cc lightning/src/ln/payment_tests.rs
Simple merge

diff --cc lightning/src/util/test_utils.rs
Simple merge