X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fscid_utils.rs;h=d2941f7fe3c8f5378f1a16267b076132384b3be2;hb=a61746246c369dada11469c25dd739f4807c042b;hp=128a70789ec126efa29febef9371319fe0b63db6;hpb=5824e226cad67e32d5e8be71ebbb6f91a3fc2116;p=rust-lightning

diff --git a/lightning/src/util/scid_utils.rs b/lightning/src/util/scid_utils.rs
index 128a7078..d2941f7f 100644
--- a/lightning/src/util/scid_utils.rs
+++ b/lightning/src/util/scid_utils.rs
@@ -68,7 +68,7 @@ pub fn scid_from_parts(block: u64, tx_index: u64, vout_index: u64) -> Result<u64
 pub(crate) mod fake_scid {
 	use bitcoin::hash_types::BlockHash;
 	use bitcoin::hashes::hex::FromHex;
-	use crate::chain::keysinterface::EntropySource;
+	use crate::sign::EntropySource;
 	use crate::util::chacha20::ChaCha20;
 	use crate::util::scid_utils;
 
@@ -101,13 +101,13 @@ pub(crate) mod fake_scid {
 		/// between segwit activation and the current best known height, and the tx index and output
 		/// index are also selected from a "reasonable" range. We add this logic because it makes it
 		/// non-obvious at a glance that the scid is fake, e.g. if it appears in invoice route hints.
-		pub(crate) fn get_fake_scid<K: Deref>(&self, highest_seen_blockheight: u32, genesis_hash: &BlockHash, fake_scid_rand_bytes: &[u8; 32], keys_manager: &K) -> u64
-			where K::Target: EntropySource,
+		pub(crate) fn get_fake_scid<ES: Deref>(&self, highest_seen_blockheight: u32, genesis_hash: &BlockHash, fake_scid_rand_bytes: &[u8; 32], entropy_source: &ES) -> u64
+			where ES::Target: EntropySource,
 		{
 			// Ensure we haven't created a namespace that doesn't fit into the 3 bits we've allocated for
 			// namespaces.
 			assert!((*self as u8) < MAX_NAMESPACES);
-			let rand_bytes = keys_manager.get_secure_random_bytes();
+			let rand_bytes = entropy_source.get_secure_random_bytes();
 
 			let segwit_activation_height = segwit_activation_height(genesis_hash);
 			let mut blocks_since_segwit_activation = highest_seen_blockheight.saturating_sub(segwit_activation_height);