Convert fee API to per_kw instead of per_vb

[rust-lightning] / fuzz / fuzz_targets / channel_target.rs

diff --git a/fuzz/fuzz_targets/channel_target.rs b/fuzz/fuzz_targets/channel_target.rs
index 2c0da092ed335ead955cfe0e15b9ef16b045c790..27891e11aa9aad2e96783659158fbc4d81aa5eac 100644 (file)
--- a/fuzz/fuzz_targets/channel_target.rs
+++ b/fuzz/fuzz_targets/channel_target.rs
@@ -12,6 +12,7 @@ use lightning::ln::channelmanager::{HTLCFailReason, PendingForwardHTLCInfo};
 use lightning::ln::msgs;
 use lightning::ln::msgs::MsgDecodable;
 use lightning::chain::chaininterface::{FeeEstimator, ConfirmationTarget};
+use lightning::chain::transaction::OutPoint;
 use lightning::util::reset_rng_state;
 
 use secp256k1::key::{PublicKey, SecretKey};
@@ -79,10 +80,10 @@ struct FuzzEstimator<'a> {
        input: &'a InputData<'a>,
 }
 impl<'a> FeeEstimator for FuzzEstimator<'a> {
-       fn get_est_sat_per_vbyte(&self, _: ConfirmationTarget) -> u64 {
+       fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u64 {
                //TODO: We should actually be testing at least much more than 64k...
                match self.input.get_slice(2) {
-                       Some(slice) => slice_to_be16(slice) as u64,
+                       Some(slice) => slice_to_be16(slice) as u64 * 250,
                        None => 0
                }
        }
@@ -117,6 +118,7 @@ pub fn do_test(data: &[u8]) {
                                        msgs::DecodeError::UnknownRealmByte => return,
                                        msgs::DecodeError::BadPublicKey => return,
                                        msgs::DecodeError::BadSignature => return,
+                                       msgs::DecodeError::BadText => return,
                                        msgs::DecodeError::ExtraAddressesPerType => return,
                                        msgs::DecodeError::WrongLength => panic!("We picked the length..."),
                                }
@@ -137,6 +139,7 @@ pub fn do_test(data: &[u8]) {
                                                msgs::DecodeError::UnknownRealmByte => return,
                                                msgs::DecodeError::BadPublicKey => return,
                                                msgs::DecodeError::BadSignature => return,
+                                               msgs::DecodeError::BadText => return,
                                                msgs::DecodeError::ExtraAddressesPerType => return,
                                                msgs::DecodeError::WrongLength => panic!("We picked the length..."),
                                        }
@@ -158,7 +161,7 @@ pub fn do_test(data: &[u8]) {
        macro_rules! return_err {
                ($expr: expr) => {
                        match $expr {
-                               Ok(_) => {},
+                               Ok(r) => r,
                                Err(_) => return,
                        }
                }
@@ -196,9 +199,9 @@ pub fn do_test(data: &[u8]) {
                return_err!(chan.accept_channel(&accept_chan));
 
                tx.output.push(TxOut{ value: chan_value, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() });
-               let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+               let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
 
-               chan.get_outbound_funding_created(funding_output.0.clone(), funding_output.1).unwrap();
+               chan.get_outbound_funding_created(funding_output).unwrap();
                let funding_signed = decode_msg!(msgs::FundingSigned, 32+64);
                return_err!(chan.funding_signed(&funding_signed));
                chan
@@ -215,11 +218,11 @@ pub fn do_test(data: &[u8]) {
                chan.get_accept_channel().unwrap();
 
                tx.output.push(TxOut{ value: open_chan.funding_satoshis, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() });
-               let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+               let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
 
                let mut funding_created = decode_msg!(msgs::FundingCreated, 32+32+2+64);
-               funding_created.funding_txid = funding_output.0.clone();
-               funding_created.funding_output_index = funding_output.1;
+               funding_created.funding_txid = funding_output.txid.clone();
+               funding_created.funding_output_index = funding_output.index;
                return_err!(chan.funding_created(&funding_created));
                chan
        };
@@ -278,10 +281,14 @@ pub fn do_test(data: &[u8]) {
                        9 => {
                                let shutdown = decode_msg_with_len16!(msgs::Shutdown, 32, 1);
                                return_err!(channel.shutdown(&fee_est, &shutdown));
+                               if channel.is_shutdown() { return; }
                        },
                        10 => {
                                let closing_signed = decode_msg!(msgs::ClosingSigned, 32+8+64);
-                               return_err!(channel.closing_signed(&fee_est, &closing_signed));
+                               if return_err!(channel.closing_signed(&fee_est, &closing_signed)).1.is_some() {
+                                       assert!(channel.is_shutdown());
+                                       return;
+                               }
                        },
                        _ => return,
                }