Merge pull request #167 from TheBlueMatt/2018-09-dup-htlc

 Allow duplicate-payment_hash HTLCs for HTLC forwards

diff --cc fuzz/fuzz_targets/channel_target.rs
index 7eed4fb55d3fa4bf40bc124d78fbb7271b89dd05,f6e88417c72ab0f4bd514fc525900b18cd1174c6..d33ac94192a5efeaecc3829dd26c6ab9d7e94751
--- 1/fuzz/fuzz_targets/channel_target.rs
--- 2/fuzz/fuzz_targets/channel_target.rs
+++ b/fuzz/fuzz_targets/channel_target.rs
@@@ -8,9 -8,9 +8,9 @@@ use bitcoin::util::hash::Sha256dHash
  use bitcoin::network::serialize::{serialize, BitcoinHash};
  
  use lightning::ln::channel::{Channel, ChannelKeys};
- use lightning::ln::channelmanager::{HTLCFailReason, PendingHTLCStatus};
+ use lightning::ln::channelmanager::{HTLCFailReason, HTLCSource, PendingHTLCStatus};
  use lightning::ln::msgs;
 -use lightning::ln::msgs::{MsgDecodable, ErrorAction};
 +use lightning::ln::msgs::{ErrorAction};
  use lightning::chain::chaininterface::{FeeEstimator, ConfirmationTarget};
  use lightning::chain::transaction::OutPoint;
  use lightning::util::reset_rng_state;