X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftest_utils.rs;h=3c36cdf066a5048bbb1b6fe112c2906ac824e6cc;hb=e49f738630559ce2eaa97689f1b4d37546fc7020;hp=2ec679232b9909aaa49727b500221b4fdd46f5e1;hpb=d70292d6c8db9ee4ddc7889ddc4682b9cfc6be72;p=rust-lightning

diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
index 2ec67923..3c36cdf0 100644
--- a/lightning/src/util/test_utils.rs
+++ b/lightning/src/util/test_utils.rs
@@ -384,7 +384,7 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 		Vec::new()
 	}
 
-	fn sync_routing_table(&self, _their_node_id: &PublicKey, _init_msg: &msgs::Init) {}
+	fn peer_connected(&self, _their_node_id: &PublicKey, _init_msg: &msgs::Init) {}
 
 	fn handle_reply_channel_range(&self, _their_node_id: &PublicKey, _msg: msgs::ReplyChannelRange) -> Result<(), msgs::LightningError> {
 		Ok(())
@@ -477,8 +477,7 @@ impl Logger for TestLogger {
 
 pub struct TestKeysInterface {
 	pub backing: keysinterface::PhantomKeysManager,
-	pub override_session_priv: Mutex<Option<[u8; 32]>>,
-	pub override_channel_id_priv: Mutex<Option<[u8; 32]>>,
+	pub override_random_bytes: Mutex<Option<[u8; 32]>>,
 	pub disable_revocation_policy_check: bool,
 	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
 	expectations: Mutex<Option<VecDeque<OnGetShutdownScriptpubkey>>>,
@@ -512,16 +511,9 @@ impl keysinterface::KeysInterface for TestKeysInterface {
 	}
 
 	fn get_secure_random_bytes(&self) -> [u8; 32] {
-		let override_channel_id = self.override_channel_id_priv.lock().unwrap();
-		let override_session_key = self.override_session_priv.lock().unwrap();
-		if override_channel_id.is_some() && override_session_key.is_some() {
-			panic!("We don't know which override key to use!");
-		}
-		if let Some(key) = &*override_channel_id {
-			return *key;
-		}
-		if let Some(key) = &*override_session_key {
-			return *key;
+		let override_random_bytes = self.override_random_bytes.lock().unwrap();
+		if let Some(bytes) = &*override_random_bytes {
+			return *bytes;
 		}
 		self.backing.get_secure_random_bytes()
 	}
@@ -549,8 +541,7 @@ impl TestKeysInterface {
 		let now = Duration::from_secs(genesis_block(network).header.time as u64);
 		Self {
 			backing: keysinterface::PhantomKeysManager::new(seed, now.as_secs(), now.subsec_nanos(), seed),
-			override_session_priv: Mutex::new(None),
-			override_channel_id_priv: Mutex::new(None),
+			override_random_bytes: Mutex::new(None),
 			disable_revocation_policy_check: false,
 			enforcement_states: Mutex::new(HashMap::new()),
 			expectations: Mutex::new(None),