Merge pull request #170 from TheBlueMatt/2018-09-119-rebased

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

diff --git a/fuzz/fuzz_targets/router_target.rs b/fuzz/fuzz_targets/router_target.rs
index 6476f812fb34dd2243ea1a585e6753eb44b3a52b..fc3e9e9ba9ace20c1de0db547b14fb88360e369b 100644 (file)
--- a/fuzz/fuzz_targets/router_target.rs
+++ b/fuzz/fuzz_targets/router_target.rs
@@ -8,10 +8,11 @@ use bitcoin::blockdata::script::{Script, Builder};
 use lightning::chain::chaininterface::{ChainError,ChainWatchInterface, ChainListener};
 use lightning::ln::channelmanager::ChannelDetails;
 use lightning::ln::msgs;
-use lightning::ln::msgs::{MsgDecodable, RoutingMessageHandler};
+use lightning::ln::msgs::{RoutingMessageHandler};
 use lightning::ln::router::{Router, RouteHint};
 use lightning::util::reset_rng_state;
 use lightning::util::logger::Logger;
+use lightning::util::ser::{Reader, Readable};
 
 use secp256k1::key::PublicKey;
 use secp256k1::Secp256k1;
@@ -119,8 +120,9 @@ 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 = Reader::new(::std::io::Cursor::new(get_slice!($len)));
+                       match <($MsgType)>::read(&mut reader) {
                                Ok(msg) => msg,
                                Err(e) => match e {
                                        msgs::DecodeError::UnknownRealmByte => return,
@@ -131,9 +133,11 @@ pub fn do_test(data: &[u8]) {
                                        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 {