X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fchannelmanager.rs;h=3d70b1d379a4391461b3c5a756e126716d8d701d;hb=ab56b81acd9da3a697dfc37fc4cb43cd8fbb1a2c;hp=14e089249cdd37adc089a40b772abbe486301ce0;hpb=f47ba769f544c4fd2e2d1aa0bd5b1fa74ae15daa;p=rust-lightning

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index 14e08924..3d70b1d3 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -17,16 +17,12 @@ use ln::channelmonitor::ManyChannelMonitor;
 use ln::router::Route;
 use ln::msgs;
 use ln::msgs::{HandleError,ChannelMessageHandler,MsgEncodable,MsgDecodable};
-use util::byte_utils;
-use util::events;
-use util::internal_traits;
-
-use rand::{thread_rng,Rng};
+use util::{byte_utils, events, internal_traits, rng};
+use util::sha2::Sha256;
 
 use crypto::mac::{Mac,MacResult};
 use crypto::hmac::Hmac;
 use crypto::digest::Digest;
-use crypto::sha2::Sha256;
 use crypto::symmetriccipher::SynchronousStreamCipher;
 use crypto::chacha20::ChaCha20;
 
@@ -468,10 +464,9 @@ impl ChannelManager {
 			}
 		}
 
-		let mut rng = thread_rng();
 		let session_priv = secp_call!(SecretKey::from_slice(&self.secp_ctx, &{
 			let mut session_key = [0; 32];
-			rng.fill_bytes(&mut session_key);
+			rng::fill_bytes(&mut session_key);
 			session_key
 		}));
 
@@ -1319,8 +1314,7 @@ impl ChannelMessageHandler for ChannelManager {
 			};
 
 			if channel_state.forward_htlcs.is_empty() {
-				let mut rng = thread_rng();
-				forward_event = Some(Instant::now() + Duration::from_millis(((rng.next_f32() * 4.0 + 1.0) * MIN_HTLC_RELAY_HOLDING_CELL_MILLIS as f32) as u64));
+				forward_event = Some(Instant::now() + Duration::from_millis(((rng::rand_f32() * 4.0 + 1.0) * MIN_HTLC_RELAY_HOLDING_CELL_MILLIS as f32) as u64));
 				channel_state.next_forward = forward_event.unwrap();
 			}
 			for forward_info in forwarding_infos.drain(..) {