Simplify serialization a bit by removing the useless newtypes

[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 37cf11a8c43510a964fd1199aba0e7a5a6d6a1b1..e7cc6f76c999e42d6bdfc861a6a0244f500b1885 100644 (file)
--- a/fuzz/fuzz_targets/channel_target.rs
+++ b/fuzz/fuzz_targets/channel_target.rs
@@ -8,13 +8,14 @@ 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;
 use lightning::util::logger::Logger;
+use lightning::util::ser::Readable;
 
 mod utils;
 
@@ -119,20 +120,24 @@ pub fn do_test(data: &[u8]) {
        }
 
        macro_rules! decode_msg {
-               ($MsgType: path, $len: expr) => {
-                       match <($MsgType)>::decode(get_slice!($len)) {
+               ($MsgType: path, $len: expr) => {{
+                       let mut reader = ::std::io::Cursor::new(get_slice!($len));
+                       match <($MsgType)>::read(&mut reader) {
                                Ok(msg) => msg,
                                Err(e) => match e {
                                        msgs::DecodeError::UnknownRealmByte => return,
+                                       msgs::DecodeError::UnknownRequiredFeature => return,
                                        msgs::DecodeError::BadPublicKey => return,
                                        msgs::DecodeError::BadSignature => return,
                                        msgs::DecodeError::BadText => return,
                                        msgs::DecodeError::ExtraAddressesPerType => return,
                                        msgs::DecodeError::BadLengthDescriptor => return,
                                        msgs::DecodeError::ShortRead => panic!("We picked the length..."),
+                                       msgs::DecodeError::InvalidValue => panic!("Should not happen with p2p message decoding"),
+                                       msgs::DecodeError::Io(e) => panic!(format!("{}", e)),
                                }
                        }
-               }
+               }}
        }
 
        macro_rules! decode_msg_with_len16 {
@@ -142,18 +147,7 @@ pub fn do_test(data: &[u8]) {
                                        Some(slice) => slice,
                                        None => return,
                                }[$begin_len..$begin_len + 2]);
-                               match <($MsgType)>::decode(get_slice!($begin_len as usize + 2 + (extra_len as usize)*$factor)) {
-                                       Ok(msg) => msg,
-                                       Err(e) => match e {
-                                               msgs::DecodeError::UnknownRealmByte => return,
-                                               msgs::DecodeError::BadPublicKey => return,
-                                               msgs::DecodeError::BadSignature => return,
-                                               msgs::DecodeError::BadText => return,
-                                               msgs::DecodeError::ExtraAddressesPerType => return,
-                                               msgs::DecodeError::BadLengthDescriptor => return,
-                                               msgs::DecodeError::ShortRead => panic!("We picked the length..."),
-                                       }
-                               }
+                               decode_msg!($MsgType, $begin_len as usize + 2 + (extra_len as usize)*$factor)
                        }
                }
        }
@@ -203,7 +197,7 @@ pub fn do_test(data: &[u8]) {
                        Ok(chan) => chan,
                        Err(_) => return,
                };
-               chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est).unwrap();
+               chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est);
                let accept_chan = if get_slice!(1)[0] == 0 {
                        decode_msg_with_len16!(msgs::AcceptChannel, 270, 1)
                } else {
@@ -228,7 +222,7 @@ pub fn do_test(data: &[u8]) {
                        Ok(chan) => chan,
                        Err(_) => return,
                };
-               chan.get_accept_channel().unwrap();
+               chan.get_accept_channel();
 
                tx.output.push(TxOut{ value: open_chan.funding_satoshis, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() });
                let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
@@ -256,7 +250,6 @@ pub fn do_test(data: &[u8]) {
                                Ok(r) => Some(r),
                                Err(e) => match e.action {
                                        None => return,
-                                       Some(ErrorAction::UpdateFailHTLC {..}) => None,
                                        Some(ErrorAction::DisconnectPeer {..}) => return,
                                        Some(ErrorAction::IgnoreError) => None,
                                        Some(ErrorAction::SendErrorMessage {..}) => None,
@@ -268,9 +261,9 @@ pub fn do_test(data: &[u8]) {
        loop {
                match get_slice!(1)[0] {
                        0 => {
-                               test_err!(channel.send_htlc(slice_to_be64(get_slice!(8)), [42; 32], slice_to_be32(get_slice!(4)), msgs::OnionPacket {
+                               test_err!(channel.send_htlc(slice_to_be64(get_slice!(8)), [42; 32], slice_to_be32(get_slice!(4)), HTLCSource::dummy(), msgs::OnionPacket {
                                        version: get_slice!(1)[0],
-                                       public_key: get_pubkey!(),
+                                       public_key: PublicKey::from_slice(&secp_ctx, get_slice!(33)),
                                        hop_data: [0; 20*65],
                                        hmac: [0; 32],
                                }));