Merge pull request #139 from TheBlueMatt/2018-08-fuzz-fixes-7

Fix crash that #127 intended to fix but did not completely fix

Author: TheBlueMatt

src/ln/channel.rs

@@ -1133,9 +1133,6 @@ impl Channel {
 		let mut htlc_amount_msat = 0;
 		for htlc in self.pending_htlcs.iter_mut() {
 			if !htlc.outbound && htlc.payment_hash == *payment_hash_arg {
-				if htlc_id != 0 {
-					panic!("Duplicate HTLC payment_hash, you probably re-used payment preimages, NEVER DO THIS!");
-				}
 				if htlc.state == HTLCState::Committed {
 					htlc.state = HTLCState::LocalRemoved;
 				} else if htlc.state == HTLCState::RemoteAnnounced {
@@ -1152,6 +1149,9 @@ impl Channel {
 				} else {
 					panic!("Have an inbound HTLC when not awaiting remote revoke that had a garbage state");
 				}
+				if htlc_id != 0 {
+					panic!("Duplicate HTLC payment_hash, you probably re-used payment preimages, NEVER DO THIS!");
+				}
 				htlc_id = htlc.htlc_id;
 				htlc_amount_msat += htlc.amount_msat;
 			}

src/ln/channelmanager.rs

@@ -2274,7 +2274,6 @@ mod tests {
 	}
 
 	struct Node {
-		feeest: Arc<test_utils::TestFeeEstimator>,
 		chain_monitor: Arc<chaininterface::ChainWatchInterfaceUtil>,
 		tx_broadcaster: Arc<test_utils::TestBroadcaster>,
 		chan_monitor: Arc<test_utils::TestChannelMonitor>,
@@ -2827,7 +2826,7 @@ mod tests {
 			};
 			let node = ChannelManager::new(node_id.clone(), 0, true, Network::Testnet, feeest.clone(), chan_monitor.clone(), chain_monitor.clone(), tx_broadcaster.clone(), Arc::clone(&logger)).unwrap();
 			let router = Router::new(PublicKey::from_secret_key(&secp_ctx, &node_id), Arc::clone(&logger));
-			nodes.push(Node { feeest, chain_monitor, tx_broadcaster, chan_monitor, node, router });
+			nodes.push(Node { chain_monitor, tx_broadcaster, chan_monitor, node, router });
 		}
 
 		nodes