Merge pull request #2478 from waterson/settle-htlcs

Provide the HTLCs that settled a payment.

diff --cc lightning/src/events/mod.rs
Simple merge

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

diff --cc lightning/src/ln/functional_test_utils.rs
index 48ce0f9464d79d15b32a05c0cc355a3d838c51ca,73d09c76f9f7ea74d834e3a9573e2995bf0cc0a4..1db4e873458001b820db2ba4d0284e89a95b20ce
--- 1/lightning/src/ln/functional_test_utils.rs
--- 2/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;