X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fchannelmanager.rs;h=bcb928cca8f025ceb484b1a5dcaf594fe3158850;hb=8d706789e717797ff37fdf8c999c14a09d2ac9a5;hp=ba535d007bc0f8c64678a07008ba41ce6af53760;hpb=0112394e52ad63f9d2ed404dfc85d93a29a57ed6;p=rust-lightning

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index ba535d00..bcb928cc 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -365,9 +365,15 @@ impl ChannelManager {
 		let channel = Channel::new_outbound(&*self.fee_estimator, chan_keys, their_network_key, channel_value_satoshis, push_msat, self.announce_channels_publicly, user_id, Arc::clone(&self.logger))?;
 		let res = channel.get_open_channel(self.genesis_hash.clone(), &*self.fee_estimator);
 		let mut channel_state = self.channel_state.lock().unwrap();
-		match channel_state.by_id.insert(channel.channel_id(), channel) {
-			Some(_) => panic!("RNG is bad???"),
-			None => {}
+		match channel_state.by_id.entry(channel.channel_id()) {
+			hash_map::Entry::Occupied(_) => {
+				if cfg!(feature = "fuzztarget") {
+					return Err(APIError::APIMisuseError { err: "Fuzzy bad RNG" });
+				} else {
+					panic!("RNG is bad???");
+				}
+			},
+			hash_map::Entry::Vacant(entry) => { entry.insert(channel); }
 		}
 
 		let mut events = self.pending_events.lock().unwrap();
@@ -2456,9 +2462,11 @@ mod tests {
 	}
 	impl Drop for Node {
 		fn drop(&mut self) {
-			// Check that we processed all pending events
-			assert_eq!(self.node.get_and_clear_pending_events().len(), 0);
-			assert_eq!(self.chan_monitor.added_monitors.lock().unwrap().len(), 0);
+			if !::std::thread::panicking() {
+				// Check that we processed all pending events
+				assert_eq!(self.node.get_and_clear_pending_events().len(), 0);
+				assert_eq!(self.chan_monitor.added_monitors.lock().unwrap().len(), 0);
+			}
 		}
 	}