Simplify DecodeError enum by removing some useless distinctions

[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 288dc56a432cee896a646d16017fdd423745af41..52f9a235fe731aa93bfa94b4ccaa913a53df41bf 100644 (file)
--- a/fuzz/fuzz_targets/router_target.rs
+++ b/fuzz/fuzz_targets/router_target.rs
@@ -4,15 +4,15 @@ extern crate secp256k1;
 
 use bitcoin::util::hash::Sha256dHash;
 use bitcoin::blockdata::script::{Script, Builder};
-use bitcoin::blockdata::opcodes;
 
 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::Readable;
 
 use secp256k1::key::PublicKey;
 use secp256k1::Secp256k1;
@@ -77,22 +77,19 @@ struct DummyChainWatcher {
 }
 
 impl ChainWatchInterface for DummyChainWatcher {
-       fn install_watch_script(&self, _script_pub_key: &Script) {
-       }
-
-       fn install_watch_outpoint(&self, _outpoint: (Sha256dHash, u32), _out_script: &Script) {
-       }
-
-       fn watch_all_txn(&self) {
-       }
-
-       fn register_listener(&self, _listener: Weak<ChainListener>) {
-       }
+       fn install_watch_tx(&self, _txid: &Sha256dHash, _script_pub_key: &Script) { }
+       fn install_watch_outpoint(&self, _outpoint: (Sha256dHash, u32), _out_script: &Script) { }
+       fn watch_all_txn(&self) { }
+       fn register_listener(&self, _listener: Weak<ChainListener>) { }
 
        fn get_chain_utxo(&self, _genesis_hash: Sha256dHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
-               match self.input.get_slice(1) {
-                       Some(slice) => Ok((Builder::new().push_opcode(opcodes::All::OP_PUSHBYTES_0).into_script().to_v0_p2wsh(), 0)),
+               match self.input.get_slice(2) {
+                       Some(&[0, _]) => Err(ChainError::NotSupported),
+                       Some(&[1, _]) => Err(ChainError::NotWatched),
+                       Some(&[2, _]) => Err(ChainError::UnknownTx),
+                       Some(&[_, x]) => Ok((Builder::new().push_int(x as i64).into_script().to_v0_p2wsh(), 0)),
                        None => Err(ChainError::UnknownTx),
+                       _ => unreachable!(),
                }
        }
 }
@@ -123,21 +120,21 @@ 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::UnknownVersion => return,
                                        msgs::DecodeError::UnknownRequiredFeature => return,
-                                       msgs::DecodeError::BadPublicKey => return,
-                                       msgs::DecodeError::BadSignature => return,
-                                       msgs::DecodeError::BadText => return,
+                                       msgs::DecodeError::InvalidValue => return,
                                        msgs::DecodeError::ExtraAddressesPerType => return,
                                        msgs::DecodeError::BadLengthDescriptor => return,
                                        msgs::DecodeError::ShortRead => panic!("We picked the length..."),
+                                       msgs::DecodeError::Io(e) => panic!(format!("{}", e)),
                                }
                        }
-               }
+               }}
        }
 
        macro_rules! decode_msg_with_len16 {