X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=151564e556dc76bc3da752b4875ce0a3636c76a9;hb=479da71192044f805dd9ca0c91719c90adb441e1;hp=c9eebf41eb4706b3a7d39c10600c92e7c8e8949e;hpb=87126b391b895098484a86dc484a381b825e9a31;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index c9eebf41..151564e5 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -35,6 +35,9 @@ use std::default::Default;
 use std::{cmp,mem,fmt};
 use std::ops::Deref;
 
+#[cfg(all(test, feature = "mutation_testing"))]
+use mutagen::mutate;
+
 #[cfg(test)]
 pub struct ChannelValueStat {
 	pub value_to_self_msat: u64,
@@ -363,7 +366,7 @@ pub const OUR_MAX_HTLCS: u16 = 50; //TODO
 /// Confirmation count threshold at which we close a channel. Ideally we'd keep the channel around
 /// on ice until the funding transaction gets more confirmations, but the LN protocol doesn't
 /// really allow for this, so instead we're stuck closing it out at that point.
-const UNCONF_THRESHOLD: u32 = 6;
+const UNCONF_THRESHOLD: u32 = 1;
 const SPENDING_INPUT_FOR_A_OUTPUT_WEIGHT: u64 = 79; // prevout: 36, nSequence: 4, script len: 1, witness lengths: (3+1)/4, sig: 73/4, if-selector: 1, redeemScript: (6 ops + 2*33 pubkeys + 1*2 delay)/4
 const B_OUTPUT_PLUS_SPENDING_INPUT_WEIGHT: u64 = 104; // prevout: 40, nSequence: 4, script len: 1, witness lengths: 3/4, sig: 73/4, pubkey: 33/4, output: 31 (TODO: Wrong? Useless?)
 
@@ -536,7 +539,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 		if (feerate_per_kw as u64) < fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background) {
 			return Err(ChannelError::Close("Peer's feerate much too low"));
 		}
-		if (feerate_per_kw as u64) > fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::HighPriority) * 2 {
+		if (feerate_per_kw as u64) > fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::HighPriority) * 200 {
 			return Err(ChannelError::Close("Peer's feerate much too high"));
 		}
 		Ok(())
@@ -1705,6 +1708,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 		let mut removed_outbound_total_msat = 0;
 		for ref htlc in self.pending_outbound_htlcs.iter() {
 			if let OutboundHTLCState::AwaitingRemoteRevokeToRemove(None) = htlc.state {
+debug_assert!(false, "This should be triggerable, and we should add a test case that does so!");
 				removed_outbound_total_msat += htlc.amount_msat;
 			} else if let OutboundHTLCState::AwaitingRemovedRemoteRevoke(None) = htlc.state {
 				removed_outbound_total_msat += htlc.amount_msat;
@@ -1747,6 +1751,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 					None => {},
 					Some(payment_hash) =>
 						if payment_hash != htlc.payment_hash {
+							println!("FAIL: {:?}, {:?}", htlc.payment_hash, payment_hash);
 							return Err(ChannelError::Close("Remote tried to fulfill HTLC with an incorrect preimage"));
 						}
 				};
@@ -2357,6 +2362,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 		}
 	}
 
+	#[cfg_attr(all(test, feature = "mutation_testing"), mutate)]
 	/// Removes any uncommitted HTLCs, to be used on peer disconnection, including any pending
 	/// HTLCs that we intended to add but haven't as we were waiting on a remote revoke.
 	/// Returns the set of PendingHTLCStatuses from remote uncommitted HTLCs (which we're
@@ -2443,6 +2449,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 		self.channel_state |= ChannelState::MonitorUpdateFailed as u32;
 	}
 
+	#[cfg_attr(all(test, feature = "mutation_testing"), mutate)]
 	/// Indicates that the latest ChannelMonitor update has been committed by the client
 	/// successfully and we should restore normal operation. Returns messages which should be sent
 	/// to the remote side.
@@ -2513,6 +2520,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 		Ok(())
 	}
 
+	#[cfg_attr(all(test, feature = "mutation_testing"), mutate)]
 	fn get_last_revoke_and_ack(&self) -> msgs::RevokeAndACK {
 		let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(self.cur_local_commitment_transaction_number));
 		let per_commitment_secret = chan_utils::build_commitment_secret(self.local_keys.commitment_seed(), self.cur_local_commitment_transaction_number + 2);