X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Ffuzz_targets%2Frouter_target.rs;h=9d06c19d6386336cb4f95cbac7e769f86c2d65b8;hb=cd21a357d85eec93668f2526e300746a921cbad2;hp=d8755956202a17d153825c79c66b4f50730a73e3;hpb=6016ca18709bec800ce0b290ebc946ecbe9e73e4;p=rust-lightning

diff --git a/fuzz/fuzz_targets/router_target.rs b/fuzz/fuzz_targets/router_target.rs
index d8755956..9d06c19d 100644
--- a/fuzz/fuzz_targets/router_target.rs
+++ b/fuzz/fuzz_targets/router_target.rs
@@ -1,26 +1,28 @@
 extern crate bitcoin;
+extern crate bitcoin_hashes;
 extern crate lightning;
 extern crate secp256k1;
 
-use bitcoin::util::hash::Sha256dHash;
+use bitcoin_hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::blockdata::script::{Script, Builder};
+use bitcoin::blockdata::block::Block;
+use bitcoin::blockdata::transaction::Transaction;
 
-use lightning::chain::chaininterface::{ChainError,ChainWatchInterface, ChainListener};
+use lightning::chain::chaininterface::{ChainError,ChainWatchInterface};
 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;
 
 mod utils;
 
 use utils::test_logger;
 
-use std::sync::{Weak, Arc};
+use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 #[inline]
@@ -76,10 +78,13 @@ struct DummyChainWatcher {
 }
 
 impl ChainWatchInterface for DummyChainWatcher {
-	fn install_watch_script(&self, _script_pub_key: &Script) { }
+	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 filter_block<'a>(&self, _block: &'a Block) -> (Vec<&'a Transaction>, Vec<u32>) {
+		(Vec::new(), Vec::new())
+	}
+	fn reentered(&self) -> usize { 0 }
 
 	fn get_chain_utxo(&self, _genesis_hash: Sha256dHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
 		match self.input.get_slice(2) {
@@ -95,8 +100,6 @@ impl ChainWatchInterface for DummyChainWatcher {
 
 #[inline]
 pub fn do_test(data: &[u8]) {
-	reset_rng_state();
-
 	let input = Arc::new(InputData {
 		data: data.to_vec(),
 		read_pos: AtomicUsize::new(0),
@@ -119,21 +122,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 {
@@ -145,17 +148,16 @@ pub fn do_test(data: &[u8]) {
 		}
 	}
 
-	let secp_ctx = Secp256k1::new();
 	macro_rules! get_pubkey {
 		() => {
-			match PublicKey::from_slice(&secp_ctx, get_slice!(33)) {
+			match PublicKey::from_slice(get_slice!(33)) {
 				Ok(key) => key,
 				Err(_) => return,
 			}
 		}
 	}
 
-	let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{});
+	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned()));
 	let chain_monitor = Arc::new(DummyChainWatcher {
 		input: Arc::clone(&input),
 	});
@@ -186,7 +188,7 @@ pub fn do_test(data: &[u8]) {
 					},
 					1 => {
 						let short_channel_id = slice_to_be64(get_slice!(8));
-						router.handle_htlc_fail_channel_update(&msgs::HTLCFailChannelUpdate::ChannelClosed {short_channel_id});
+						router.handle_htlc_fail_channel_update(&msgs::HTLCFailChannelUpdate::ChannelClosed {short_channel_id, is_permanent: false});
 					},
 					_ => return,
 				}
@@ -205,6 +207,9 @@ pub fn do_test(data: &[u8]) {
 								remote_network_id: get_pubkey!(),
 								channel_value_satoshis: slice_to_be64(get_slice!(8)),
 								user_id: 0,
+								inbound_capacity_msat: 0,
+								is_live: true,
+								outbound_capacity_msat: 0,
 							});
 						}
 						Some(&first_hops_vec[..])