]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Assert usize is 32 or 64 bits, as required in a TODO
authorMatt Corallo <git@bluematt.me>
Sat, 28 Jul 2018 21:39:10 +0000 (17:39 -0400)
committerMatt Corallo <git@bluematt.me>
Sun, 29 Jul 2018 17:30:04 +0000 (13:30 -0400)
src/ln/channelmanager.rs

index e4e05afd44f30b7009c414c89ae85b0851908663..707a262b14b0b7eb3cced0c174cde63b886f37cd 100644 (file)
@@ -137,13 +137,15 @@ impl ChannelHolder {
                        by_id: &mut self.by_id,
                        short_to_id: &mut self.short_to_id,
                        next_forward: &mut self.next_forward,
-                       /// short channel id -> forward infos. Key of 0 means payments received
                        forward_htlcs: &mut self.forward_htlcs,
                        claimable_htlcs: &mut self.claimable_htlcs,
                }
        }
 }
 
+#[cfg(not(any(target_pointer_width = "32", target_pointer_width = "64")))]
+const ERR: () = "You need at least 32 bit pointers (well, usize, but we'll assume they're the same) for ChannelManager::latest_block_height";
+
 /// Manager which keeps track of a number of channels and sends messages to the appropriate
 /// channel, also tracking HTLC preimages and forwarding onion packets appropriately.
 /// Implements ChannelMessageHandler, handling the multi-channel parts and passing things through
@@ -157,7 +159,7 @@ pub struct ChannelManager {
 
        announce_channels_publicly: bool,
        fee_proportional_millionths: u32,
-       latest_block_height: AtomicUsize, //TODO: Compile-time assert this is at least 32-bits long
+       latest_block_height: AtomicUsize,
        secp_ctx: Secp256k1,
 
        channel_state: Mutex<ChannelHolder>,