Enforce block connection ordering in unit and functional tests

[rust-lightning] / lightning / src / ln / channelmanager.rs

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 997570ea31a8e27609b629d721b2e7746d08595f..50f8ccbb74f4833175b00060fcd7ee882873c71b 100644 (file)
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -3302,16 +3302,10 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 
                let _persistence_guard = PersistenceNotifierGuard::new(&self.total_consistency_lock, &self.persistence_notifier);
 
-
-               // This assertion should be enforced in tests, however we have a number of tests that
-               // were written before this requirement and do not meet it.
-               #[cfg(not(test))]
-               {
-                       assert_eq!(*self.last_block_hash.read().unwrap(), header.prev_blockhash,
-                               "Blocks must be connected in chain-order - the connected header must build on the last connected header");
-                       assert_eq!(self.latest_block_height.load(Ordering::Acquire) as u64, height as u64 - 1,
-                               "Blocks must be connected in chain-order - the connected header must build on the last connected header");
-               }
+               assert_eq!(*self.last_block_hash.read().unwrap(), header.prev_blockhash,
+                       "Blocks must be connected in chain-order - the connected header must build on the last connected header");
+               assert_eq!(self.latest_block_height.load(Ordering::Acquire) as u64, height as u64 - 1,
+                       "Blocks must be connected in chain-order - the connected header must build on the last connected header");
                self.latest_block_height.store(height as usize, Ordering::Release);
                *self.last_block_hash.write().unwrap() = block_hash;