From: valentinewallace <valentinewallace@users.noreply.github.com>
Date: Thu, 26 Jan 2023 02:09:13 +0000 (-0500)
Subject: Merge pull request #1916 from valentinewallace/2022-11-chanman-payment-retries
X-Git-Tag: v0.0.114-beta~43
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e2beaef41ef63a2a423fced2381da87df35576d2;p=rust-lightning

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

`ChannelManager` Payment Retries
---

e2beaef41ef63a2a423fced2381da87df35576d2
diff --cc lightning/src/ln/channelmanager.rs
index f99e4cf6b,21fba7787..b2a23c7c1
--- a/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;