]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #1916 from valentinewallace/2022-11-chanman-payment-retries
authorvalentinewallace <valentinewallace@users.noreply.github.com>
Thu, 26 Jan 2023 02:09:13 +0000 (21:09 -0500)
committerGitHub <noreply@github.com>
Thu, 26 Jan 2023 02:09:13 +0000 (21:09 -0500)
`ChannelManager` Payment Retries

1  2 
lightning/src/ln/channelmanager.rs
lightning/src/ln/payment_tests.rs
lightning/src/util/test_utils.rs

index f99e4cf6ba5746f319f41c3638c1cfdb2db3f29d,21fba77879194bf82d025a0a1e7f04813e4c25b8..b2a23c7c1d44cbdf03137263c663acaa285774c1
@@@ -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;
Simple merge
Simple merge