From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Mon, 21 Aug 2023 22:32:54 +0000 (+0000)
Subject: Merge pull request #2478 from waterson/settle-htlcs
X-Git-Tag: v0.0.117-alpha1~53
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4bd4f02fa7f60a5e90e5c016773afaec51f99746;p=rust-lightning

Merge pull request #2478 from waterson/settle-htlcs

Provide the HTLCs that settled a payment.
---

4bd4f02fa7f60a5e90e5c016773afaec51f99746
diff --cc lightning/src/ln/functional_test_utils.rs
index 48ce0f94,73d09c76..1db4e873
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@@ -14,10 -14,10 +14,10 @@@ use crate::chain::{BestBlock, ChannelMo
  use crate::sign::EntropySource;
  use crate::chain::channelmonitor::ChannelMonitor;
  use crate::chain::transaction::OutPoint;
- use crate::events::{ClosureReason, Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, PaymentFailureReason};
+ use crate::events::{ClaimedHTLC, ClosureReason, Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, PaymentFailureReason};
  use crate::events::bump_transaction::{BumpTransactionEventHandler, Wallet, WalletSource};
  use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 -use crate::ln::channelmanager::{AChannelManager, ChainParameters, ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, PaymentId, MIN_CLTV_EXPIRY_DELTA};
 +use crate::ln::channelmanager::{self, AChannelManager, ChainParameters, ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure, RecipientOnionFields, PaymentId, MIN_CLTV_EXPIRY_DELTA};
  use crate::routing::gossip::{P2PGossipSync, NetworkGraph, NetworkUpdate};
  use crate::routing::router::{self, PaymentParameters, Route};
  use crate::ln::features::InitFeatures;