X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Ffull_stack.rs;h=d6519c3c5ee2e62e29c1362126e84f9ba0c02d2d;hb=d17e759d021c90abcbc7b3b433943d29e3c60724;hp=2150bcfb73d26b3a440dea9024299700cff2efbb;hpb=3fd85c8cf8be08480a3959bd2b829be17bdfdaa9;p=rust-lightning

diff --git a/fuzz/src/full_stack.rs b/fuzz/src/full_stack.rs
index 2150bcfb..d6519c3c 100644
--- a/fuzz/src/full_stack.rs
+++ b/fuzz/src/full_stack.rs
@@ -49,6 +49,7 @@ use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
 use lightning::routing::utxo::UtxoLookup;
 use lightning::routing::router::{InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
 use lightning::util::config::{ChannelConfig, UserConfig};
+use lightning::util::hash_tables::*;
 use lightning::util::errors::APIError;
 use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
 use lightning::util::logger::Logger;
@@ -63,7 +64,6 @@ use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
 use bitcoin::secp256k1::schnorr;
 
 use std::cell::RefCell;
-use hashbrown::{HashMap, hash_map};
 use std::convert::TryInto;
 use std::cmp;
 use std::sync::{Arc, Mutex};
@@ -216,6 +216,7 @@ struct MoneyLossDetector<'a> {
 	height: usize,
 	max_height: usize,
 	blocks_connected: u32,
+	error_message: String,
 }
 impl<'a> MoneyLossDetector<'a> {
 	pub fn new(peers: &'a RefCell<[bool; 256]>,
@@ -229,11 +230,12 @@ impl<'a> MoneyLossDetector<'a> {
 
 			peers,
 			funding_txn: Vec::new(),
-			txids_confirmed: HashMap::new(),
+			txids_confirmed: new_hash_map(),
 			header_hashes: vec![(genesis_block(Network::Bitcoin).block_hash(), 0)],
 			height: 0,
 			max_height: 0,
 			blocks_connected: 0,
+			error_message: "Channel force-closed".to_string(),
 		}
 	}
 
@@ -241,13 +243,10 @@ impl<'a> MoneyLossDetector<'a> {
 		let mut txdata = Vec::with_capacity(all_txn.len());
 		for (idx, tx) in all_txn.iter().enumerate() {
 			let txid = tx.txid();
-			match self.txids_confirmed.entry(txid) {
-				hash_map::Entry::Vacant(e) => {
-					e.insert(self.height);
-					txdata.push((idx + 1, tx));
-				},
-				_ => {},
-			}
+			self.txids_confirmed.entry(txid).or_insert_with(|| {
+				txdata.push((idx + 1, tx));
+				self.height
+			});
 		}
 
 		self.blocks_connected += 1;
@@ -291,7 +290,7 @@ impl<'a> Drop for MoneyLossDetector<'a> {
 			}
 
 			// Force all channels onto the chain (and time out claim txn)
-			self.manager.force_close_all_channels_broadcasting_latest_txn();
+			self.manager.force_close_all_channels_broadcasting_latest_txn(self.error_message.to_string());
 		}
 	}
 }
@@ -489,7 +488,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 		node_secret: our_network_key.clone(),
 		inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
 		counter: AtomicU64::new(0),
-		signer_state: RefCell::new(HashMap::new())
+		signer_state: RefCell::new(new_hash_map())
 	});
 	let network = Network::Bitcoin;
 	let best_block_timestamp = genesis_block(network).header.time;
@@ -518,7 +517,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 	let mut intercepted_htlcs: Vec<InterceptId> = Vec::new();
 	let mut payments_sent: u16 = 0;
 	let mut pending_funding_generation: Vec<(ChannelId, PublicKey, u64, ScriptBuf)> = Vec::new();
-	let mut pending_funding_signatures = HashMap::new();
+	let mut pending_funding_signatures = new_hash_map();
 
 	loop {
 		match get_slice!(1)[0] {
@@ -734,16 +733,17 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 			14 => {
 				let mut channels = channelmanager.list_channels();
 				let channel_id = get_slice!(1)[0] as usize;
+				let error_message = "Channel force-closed";
 				if channel_id >= channels.len() { return; }
 				channels.sort_by(|a, b| { a.channel_id.cmp(&b.channel_id) });
-				channelmanager.force_close_broadcasting_latest_txn(&channels[channel_id].channel_id, &channels[channel_id].counterparty.node_id).unwrap();
+				channelmanager.force_close_broadcasting_latest_txn(&channels[channel_id].channel_id, &channels[channel_id].counterparty.node_id, error_message.to_string()).unwrap();
 			},
 			// 15, 16, 17, 18 is above
 			19 => {
-				let mut list = loss_detector.handler.get_peer_node_ids();
-				list.sort_by_key(|v| v.0);
-				if let Some((id, _)) = list.get(0) {
-					loss_detector.handler.disconnect_by_node_id(*id);
+				let mut list = loss_detector.handler.list_peers();
+				list.sort_by_key(|v| v.counterparty_node_id);
+				if let Some(peer_details) = list.get(0) {
+					loss_detector.handler.disconnect_by_node_id(peer_details.counterparty_node_id);
 				}
 			},
 			20 => loss_detector.handler.disconnect_all_peers(),