From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Wed, 12 Sep 2018 17:07:13 +0000 (-0400)
Subject: Merge pull request #167 from TheBlueMatt/2018-09-dup-htlc
X-Git-Tag: v0.0.12~316
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f27c74b35cb4a9b5f44776ac6d3934e74143d51b;p=rust-lightning

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

 Allow duplicate-payment_hash HTLCs for HTLC forwards
---

f27c74b35cb4a9b5f44776ac6d3934e74143d51b
diff --cc fuzz/fuzz_targets/channel_target.rs
index 7eed4fb55,f6e88417c..d33ac9419
--- a/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;