From 479da71192044f805dd9ca0c91719c90adb441e1 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 1 Mar 2019 17:41:40 -0500 Subject: [PATCH] TESTING --- fuzz/src/full_stack.rs | 9 ++++++++- lightning/src/ln/channel.rs | 5 +++-- lightning/src/ln/channelmanager.rs | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/fuzz/src/full_stack.rs b/fuzz/src/full_stack.rs index 063fa71bd..4c1504edf 100644 --- a/fuzz/src/full_stack.rs +++ b/fuzz/src/full_stack.rs @@ -95,6 +95,7 @@ struct FuzzEstimator { } impl FeeEstimator for FuzzEstimator { fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u64 { +println!("fee_get"); //TODO: We should actually be testing at least much more than 64k... match self.input.get_slice(2) { Some(slice) => cmp::max(slice_to_be16(slice) as u64, 253), @@ -388,7 +389,9 @@ pub fn do_test(data: &[u8], logger: &Arc) { let mut pending_funding_relay = Vec::new(); loop { - match get_slice!(1)[0] { +let a = get_slice!(1)[0]; +println!("action: {}", a); + match a { 0 => { let mut new_id = 0; for i in 1..256 { @@ -575,13 +578,16 @@ pub fn do_test(data: &[u8], logger: &Arc) { // 15 is above _ => return, } +println!("PROCESSING EVENTS"); loss_detector.handler.process_events(); for event in loss_detector.manager.get_and_clear_pending_events() { match event { Event::FundingGenerationReady { temporary_channel_id, channel_value_satoshis, output_script, .. } => { +println!("fgr"); pending_funding_generation.push((temporary_channel_id, channel_value_satoshis, output_script)); }, Event::FundingBroadcastSafe { funding_txo, .. } => { +println!("fbs"); pending_funding_relay.push(pending_funding_signatures.remove(&funding_txo).unwrap()); }, Event::PaymentReceived { payment_hash, payment_secret, amt } => { @@ -591,6 +597,7 @@ pub fn do_test(data: &[u8], logger: &Arc) { Event::PaymentSent {..} => {}, Event::PaymentFailed {..} => {}, Event::PendingHTLCsForwardable {..} => { +println!("PENDING HTLCS FORWARDABLE"); should_forward = true; }, Event::SpendableOutputs {..} => {}, diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs index e53949095..151564e55 100644 --- a/lightning/src/ln/channel.rs +++ b/lightning/src/ln/channel.rs @@ -366,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?) @@ -539,7 +539,7 @@ impl Channel { 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(()) @@ -1751,6 +1751,7 @@ debug_assert!(false, "This should be triggerable, and we should add a test case 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")); } }; diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs index 709ddde2e..b5b8d890b 100644 --- a/lightning/src/ln/channelmanager.rs +++ b/lightning/src/ln/channelmanager.rs @@ -713,6 +713,7 @@ impl let res = ChannelManager { default_configuration: config.clone(), genesis_hash: genesis_block(network).header.bitcoin_hash(), + //genesis_hash: Sha256dHash::from_hex("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206").unwrap(), fee_estimator: fee_est, monitor, tx_broadcaster, -- 2.39.5