X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fkeysinterface.rs;h=114ceec211cd254fb22d14f64ac379960237f59b;hb=ec3739b7a2ff05ae1c122ceeb5466d082491e39b;hp=249a2f524604b4a64b28d2753abc78e79b369417;hpb=b6de28182f275516c142991b70c36416a50fae50;p=rust-lightning diff --git a/lightning/src/chain/keysinterface.rs b/lightning/src/chain/keysinterface.rs index 249a2f52..114ceec2 100644 --- a/lightning/src/chain/keysinterface.rs +++ b/lightning/src/chain/keysinterface.rs @@ -38,7 +38,7 @@ use ln::chan_utils::{HTLCOutputInCommitment, make_funding_redeemscript, ChannelP use ln::msgs::UnsignedChannelAnnouncement; use std::collections::HashSet; -use std::sync::atomic::{AtomicUsize, Ordering}; +use core::sync::atomic::{AtomicUsize, Ordering}; use std::io::Error; use ln::msgs::{DecodeError, MAX_VALUE_MSAT}; @@ -857,7 +857,7 @@ impl KeysManager { /// onchain output detection for which a corresponding delayed_payment_key must be derived. pub fn derive_channel_keys(&self, channel_value_satoshis: u64, params: &[u8; 32]) -> InMemorySigner { let chan_id = byte_utils::slice_to_be64(¶ms[0..8]); - assert!(chan_id <= std::u32::MAX as u64); // Otherwise the params field wasn't created by us + assert!(chan_id <= core::u32::MAX as u64); // Otherwise the params field wasn't created by us let mut unique_start = Sha256::engine(); unique_start.input(params); unique_start.input(&self.seed); @@ -1039,7 +1039,7 @@ impl KeysInterface for KeysManager { fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> Self::Signer { let child_ix = self.channel_child_index.fetch_add(1, Ordering::AcqRel); - assert!(child_ix <= std::u32::MAX as usize); + assert!(child_ix <= core::u32::MAX as usize); let mut id = [0; 32]; id[0..8].copy_from_slice(&byte_utils::be64_to_array(child_ix as u64)); id[8..16].copy_from_slice(&byte_utils::be64_to_array(self.starting_time_nanos as u64));