X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Ffuzz_targets%2Ffull_stack_target.rs;h=59f9d2bb47cc32b3e4b9f9b1cedb8a5d7c02bb19;hb=b8b7cb238da7b9ba3443d0cf87df11052185a87e;hp=4ae9be413b81ad83c19d7893fb58254309e5a17a;hpb=3057df26566f9b111db0470563689f5633ebfaec;p=rust-lightning diff --git a/fuzz/fuzz_targets/full_stack_target.rs b/fuzz/fuzz_targets/full_stack_target.rs index 4ae9be41..59f9d2bb 100644 --- a/fuzz/fuzz_targets/full_stack_target.rs +++ b/fuzz/fuzz_targets/full_stack_target.rs @@ -9,12 +9,12 @@ use bitcoin::blockdata::script::Script; use bitcoin::network::constants::Network; use bitcoin::network::serialize::{serialize, BitcoinHash}; use bitcoin::util::hash::Sha256dHash; -use bitcoin::util::uint::Uint256; use crypto::sha2::Sha256; use crypto::digest::Digest; use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil}; +use lightning::chain::transaction::OutPoint; use lightning::ln::channelmonitor; use lightning::ln::channelmanager::ChannelManager; use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor}; @@ -25,7 +25,9 @@ use lightning::util::reset_rng_state; use secp256k1::key::{PublicKey,SecretKey}; use secp256k1::Secp256k1; +use std::cell::RefCell; use std::collections::HashMap; +use std::hash::Hash; use std::sync::Arc; use std::sync::atomic::{AtomicUsize,Ordering}; @@ -82,10 +84,10 @@ struct FuzzEstimator { input: Arc, } impl FeeEstimator for FuzzEstimator { - fn get_est_sat_per_vbyte(&self, _: ConfirmationTarget) -> u64 { + fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u64 { //TODO: We should actually be testing at least much more than 64k... match self.input.get_slice(2) { - Some(slice) => slice_to_be16(slice) as u64, + Some(slice) => slice_to_be16(slice) as u64 * 250, None => 0 } } @@ -93,7 +95,7 @@ impl FeeEstimator for FuzzEstimator { struct TestChannelMonitor {} impl channelmonitor::ManyChannelMonitor for TestChannelMonitor { - fn add_update_monitor(&self, _funding_txo: (Sha256dHash, u16), _monitor: channelmonitor::ChannelMonitor) -> Result<(), channelmonitor::ChannelMonitorUpdateErr> { + fn add_update_monitor(&self, _funding_txo: OutPoint, _monitor: channelmonitor::ChannelMonitor) -> Result<(), channelmonitor::ChannelMonitorUpdateErr> { //TODO! Ok(()) } @@ -104,15 +106,31 @@ impl BroadcasterInterface for TestBroadcaster { fn broadcast_transaction(&self, _tx: &Transaction) {} } -#[derive(Clone, PartialEq, Eq, Hash)] -struct Peer { +#[derive(Clone)] +struct Peer<'a> { id: u8, + peers_connected: &'a RefCell<[bool; 256]>, } -impl SocketDescriptor for Peer { +impl<'a> SocketDescriptor for Peer<'a> { fn send_data(&mut self, data: &Vec, write_offset: usize, _resume_read: bool) -> usize { assert!(write_offset < data.len()); data.len() - write_offset } + fn disconnect_socket(&mut self) { + assert!(self.peers_connected.borrow()[self.id as usize]); + self.peers_connected.borrow_mut()[self.id as usize] = false; + } +} +impl<'a> PartialEq for Peer<'a> { + fn eq(&self, other: &Self) -> bool { + self.id == other.id + } +} +impl<'a> Eq for Peer<'a> {} +impl<'a> Hash for Peer<'a> { + fn hash(&self, h: &mut H) { + self.id.hash(h) + } } #[inline] @@ -158,16 +176,16 @@ pub fn do_test(data: &[u8]) { let channelmanager = ChannelManager::new(our_network_key, slice_to_be32(get_slice!(4)), get_slice!(1)[0] != 0, Network::Bitcoin, fee_est.clone(), monitor.clone(), watch.clone(), broadcast.clone()).unwrap(); let router = Arc::new(Router::new(PublicKey::from_secret_key(&secp_ctx, &our_network_key).unwrap())); + let peers = RefCell::new([false; 256]); let handler = PeerManager::new(MessageHandler { chan_handler: channelmanager.clone(), route_handler: router.clone(), }, our_network_key); - let mut peers = [false; 256]; let mut should_forward = false; let mut payments_received = Vec::new(); let mut payments_sent = 0; - let mut pending_funding_generation: Vec<(Uint256, u64, Script)> = Vec::new(); + let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new(); let mut pending_funding_signatures = HashMap::new(); let mut pending_funding_relay = Vec::new(); @@ -176,44 +194,44 @@ pub fn do_test(data: &[u8]) { 0 => { let mut new_id = 0; for i in 1..256 { - if !peers[i-1] { + if !peers.borrow()[i-1] { new_id = i; break; } } if new_id == 0 { return; } - peers[new_id - 1] = true; - handler.new_outbound_connection(get_pubkey!(), Peer{id: (new_id - 1) as u8}).unwrap(); + peers.borrow_mut()[new_id - 1] = true; + handler.new_outbound_connection(get_pubkey!(), Peer{id: (new_id - 1) as u8, peers_connected: &peers}).unwrap(); }, 1 => { let mut new_id = 0; for i in 1..256 { - if !peers[i-1] { + if !peers.borrow()[i-1] { new_id = i; break; } } if new_id == 0 { return; } - peers[new_id - 1] = true; - handler.new_inbound_connection(Peer{id: (new_id - 1) as u8}).unwrap(); + peers.borrow_mut()[new_id - 1] = true; + handler.new_inbound_connection(Peer{id: (new_id - 1) as u8, peers_connected: &peers}).unwrap(); }, 2 => { let peer_id = get_slice!(1)[0]; - if !peers[peer_id as usize] { return; } - peers[peer_id as usize] = false; - handler.disconnect_event(&Peer{id: peer_id}); + if !peers.borrow()[peer_id as usize] { return; } + peers.borrow_mut()[peer_id as usize] = false; + handler.disconnect_event(&Peer{id: peer_id, peers_connected: &peers}); }, 3 => { let peer_id = get_slice!(1)[0]; - if !peers[peer_id as usize] { return; } - match handler.read_event(&mut Peer{id: peer_id}, get_slice!(get_slice!(1)[0]).to_vec()) { + if !peers.borrow()[peer_id as usize] { return; } + match handler.read_event(&mut Peer{id: peer_id, peers_connected: &peers}, get_slice!(get_slice!(1)[0]).to_vec()) { Ok(res) => assert!(!res), - Err(_) => { peers[peer_id as usize] = false; } + Err(_) => { peers.borrow_mut()[peer_id as usize] = false; } } }, 4 => { let value = slice_to_be24(get_slice!(3)) as u64; - let route = match router.get_route(&get_pubkey!(), &Vec::new(), value, 42) { + let route = match router.get_route(&get_pubkey!(), None, &Vec::new(), value, 42) { Ok(route) => route, Err(_) => return, }; @@ -231,7 +249,7 @@ pub fn do_test(data: &[u8]) { }, 5 => { let peer_id = get_slice!(1)[0]; - if !peers[peer_id as usize] { return; } + if !peers.borrow()[peer_id as usize] { return; } let their_key = get_pubkey!(); let chan_value = slice_to_be24(get_slice!(3)) as u64; if channelmanager.create_channel(their_key, chan_value, 0).is_err() { return; } @@ -280,7 +298,7 @@ pub fn do_test(data: &[u8]) { let mut tx = Transaction { version: 0, lock_time: 0, input: Vec::new(), output: vec![TxOut { value: funding_generation.1, script_pubkey: funding_generation.2, }] }; - let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0); + let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0); channelmanager.funding_transaction_generated(&funding_generation.0, funding_output.clone()); pending_funding_signatures.insert(funding_output, tx); }