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 7eed4fb55d3fa4bf40bc124d78fbb7271b89dd05..e7cc6f76c999e42d6bdfc861a6a0244f500b1885 100644 (file)
--- a/fuzz/fuzz_targets/channel_target.rs
+++ b/fuzz/fuzz_targets/channel_target.rs
@@ -8,14 +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::{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, Reader};
+use lightning::util::ser::Readable;
 
 mod utils;
 
@@ -121,7 +121,7 @@ pub fn do_test(data: &[u8]) {
 
        macro_rules! decode_msg {
                ($MsgType: path, $len: expr) => {{
-                       let mut reader = Reader::new(::std::io::Cursor::new(get_slice!($len)));
+                       let mut reader = ::std::io::Cursor::new(get_slice!($len));
                        match <($MsgType)>::read(&mut reader) {
                                Ok(msg) => msg,
                                Err(e) => match e {
@@ -197,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 {
@@ -261,7 +261,7 @@ 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: PublicKey::from_slice(&secp_ctx, get_slice!(33)),
                                        hop_data: [0; 20*65],