From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Tue, 26 Jul 2022 00:23:53 +0000 (-0500)
Subject: Merge pull request #1403 from jurvis/jurvis/add-paymentforwardingfailed-event
X-Git-Tag: v0.0.110~2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f0b818952bd4da666310bacfad9321a5da995c29;p=rust-lightning

Merge pull request #1403 from jurvis/jurvis/add-paymentforwardingfailed-event

Add HTLCHandlingFailed event
---

f0b818952bd4da666310bacfad9321a5da995c29
diff --cc lightning/src/ln/functional_tests.rs
index 7572abff,8e7b3e8f..be517ea4
--- a/lightning/src/ln/functional_tests.rs
+++ b/lightning/src/ln/functional_tests.rs
@@@ -28,10 -28,10 +28,10 @@@ use routing::gossip::NetworkGraph
  use routing::router::{PaymentParameters, Route, RouteHop, RouteParameters, find_route, get_route};
  use ln::features::{ChannelFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};
  use ln::msgs;
 -use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, OptionalField, ErrorAction};
 +use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, ErrorAction};
  use util::enforcing_trait_impls::EnforcingSigner;
  use util::{byte_utils, test_utils};
- use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
+ use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
  use util::errors::APIError;
  use util::ser::{Writeable, ReadableArgs};
  use util::config::UserConfig;
diff --cc lightning/src/ln/onion_route_tests.rs
index ed1516ef,b9d86fe3..e2c64323
--- a/lightning/src/ln/onion_route_tests.rs
+++ b/lightning/src/ln/onion_route_tests.rs
@@@ -21,9 -21,9 +21,9 @@@ use routing::gossip::{NetworkUpdate, Ro
  use routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
  use ln::features::{InitFeatures, InvoiceFeatures, NodeFeatures};
  use ln::msgs;
 -use ln::msgs::{ChannelMessageHandler, ChannelUpdate, OptionalField};
 +use ln::msgs::{ChannelMessageHandler, ChannelUpdate};
  use ln::wire::Encode;
- use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
+ use util::events::{Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider};
  use util::ser::{ReadableArgs, Writeable, Writer};
  use util::{byte_utils, test_utils};
  use util::config::{UserConfig, ChannelConfig};
diff --cc lightning/src/ln/priv_short_conf_tests.rs
index d5dd51ca,5a02d15a..ed031194
--- a/lightning/src/ln/priv_short_conf_tests.rs
+++ b/lightning/src/ln/priv_short_conf_tests.rs
@@@ -19,10 -19,10 +19,10 @@@ use routing::gossip::RoutingFees
  use routing::router::{PaymentParameters, RouteHint, RouteHintHop};
  use ln::features::{InitFeatures, InvoiceFeatures, ChannelTypeFeatures};
  use ln::msgs;
 -use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, OptionalField, ChannelUpdate, ErrorAction};
 +use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, ChannelUpdate, ErrorAction};
  use ln::wire::Encode;
  use util::enforcing_trait_impls::EnforcingSigner;
- use util::events::{ClosureReason, Event, MessageSendEvent, MessageSendEventsProvider};
+ use util::events::{ClosureReason, Event, HTLCDestination, MessageSendEvent, MessageSendEventsProvider};
  use util::config::UserConfig;
  use util::ser::{Writeable, ReadableArgs};
  use util::test_utils;