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

Add HTLCHandlingFailed event

diff --cc fuzz/src/chanmon_consistency.rs
Simple merge

diff --cc lightning/src/chain/chainmonitor.rs
Simple merge

diff --cc lightning/src/chain/channelmonitor.rs
Simple merge

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

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

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

diff --cc lightning/src/ln/functional_tests.rs
index 7572abff8313e90cdd149483a3ec5e919c864398,8e7b3e8fbbd02b8a0697ca57cf29de87ab87100c..be517ea4a7698de94cd9fca02f7b57157a17e99f
--- 1/lightning/src/ln/functional_tests.rs
--- 2/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 ed1516efcb01f2c7955bd1285e476158225d58f8,b9d86fe3a6f9785868b3d906852efa0a443a10f3..e2c6432337fcadf0e5a5a498132681f26a7f997f
--- 1/lightning/src/ln/onion_route_tests.rs
--- 2/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 d5dd51cac4e86b83b77a38d22874a8915e9c398d,5a02d15a9d1e7534caacdaec66aa36c080554c77..ed0311945e6de9d491986906f5be72c0cacb07ae
--- 1/lightning/src/ln/priv_short_conf_tests.rs
--- 2/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;

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

diff --cc lightning/src/util/test_utils.rs
Simple merge