X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fscid_utils.rs;h=ce789ef9fdc6fd7eb2b23f04f7c66ff379238ac5;hb=691e10f01eb904804a6a33d8cec8fc6568b0a884;hp=38be0eb88fc3bdc0767c6725e30fb7437f3bbec4;hpb=c4a2f1bb21906853f64974dedd941dfceb673809;p=rust-lightning

diff --git a/lightning/src/util/scid_utils.rs b/lightning/src/util/scid_utils.rs
index 38be0eb8..ce789ef9 100644
--- a/lightning/src/util/scid_utils.rs
+++ b/lightning/src/util/scid_utils.rs
@@ -72,12 +72,12 @@ pub fn scid_from_parts(block: u64, tx_index: u64, vout_index: u64) -> Result<u64
 ///    the forwarding node can open a JIT channel to the next hop)
 pub(crate) mod fake_scid {
 	use bitcoin::blockdata::constants::ChainHash;
-	use bitcoin::network::constants::Network;
+	use bitcoin::Network;
 	use crate::sign::EntropySource;
 	use crate::crypto::chacha20::ChaCha20;
 	use crate::util::scid_utils;
+	use crate::prelude::*;
 
-	use core::convert::TryInto;
 	use core::ops::Deref;
 
 	const TEST_SEGWIT_ACTIVATION_HEIGHT: u32 = 1;
@@ -183,7 +183,7 @@ pub(crate) mod fake_scid {
 	#[cfg(test)]
 	mod tests {
 		use bitcoin::blockdata::constants::ChainHash;
-		use bitcoin::network::constants::Network;
+		use bitcoin::network::Network;
 		use crate::util::scid_utils::fake_scid::{is_valid_intercept, is_valid_phantom, MAINNET_SEGWIT_ACTIVATION_HEIGHT, MAX_TX_INDEX, MAX_NAMESPACES, Namespace, NAMESPACE_ID_BITMASK, segwit_activation_height, TEST_SEGWIT_ACTIVATION_HEIGHT};
 		use crate::util::scid_utils;
 		use crate::util::test_utils;