moved expensive test flag

chain/client/tests/catching_up.rs

@@ -1,8 +1,6 @@
 #[cfg(test)]
+#[cfg(feature = "expensive_tests")]
 mod tests {
-    #![allow(dead_code)]
-    #![allow(unused_imports)]
-
     use std::collections::hash_map::Entry;
     use std::collections::{HashMap, HashSet};
     use std::sync::{Arc, RwLock};
@@ -89,7 +87,6 @@ mod tests {
 
     /// Sanity checks that the incoming and outgoing receipts are properly sent and received
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_receipts_sync_third_epoch() {
         test_catchup_receipts_sync_common(13, 1, false)
     }
@@ -102,19 +99,16 @@ mod tests {
     /// The reason of increasing block_prod_time in the test is to allow syncing complete.
     /// Otherwise epochs will be changing faster than state sync happen.
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_receipts_sync_hold() {
         test_catchup_receipts_sync_common(13, 1, true)
     }
 
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_receipts_sync_last_block() {
         test_catchup_receipts_sync_common(13, 5, false)
     }
 
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_receipts_sync_distant_epoch() {
         test_catchup_receipts_sync_common(35, 1, false)
     }
@@ -362,7 +356,6 @@ mod tests {
     /// assigned to were to have incorrect receipts, the balances in the fourth epoch would have
     /// been incorrect due to wrong receipts applied during the third epoch.
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_random_single_part_sync() {
         test_catchup_random_single_part_sync_common(false, false, 13)
     }
@@ -372,27 +365,23 @@ mod tests {
     // It tests that the incoming receipts are property synced through epochs
     #[test]
     #[ignore]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_random_single_part_sync_skip_15() {
         test_catchup_random_single_part_sync_common(true, false, 13)
     }
 
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_random_single_part_sync_send_15() {
         test_catchup_random_single_part_sync_common(false, false, 15)
     }
 
     // Make sure that transactions are at least applied.
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_random_single_part_sync_non_zero_amounts() {
         test_catchup_random_single_part_sync_common(false, true, 13)
     }
 
     // Use another height to send txs.
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_random_single_part_sync_height_6() {
         test_catchup_random_single_part_sync_common(false, false, 6)
     }
@@ -616,7 +605,6 @@ mod tests {
     /// Makes sure that 24 consecutive blocks are produced by 12 validators split into three epochs.
     /// This ensures that at no point validators get stuck with state sync
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_sanity_blocks_produced() {
         let validator_groups = 2;
         init_integration_logger();
@@ -674,7 +662,6 @@ mod tests {
     ///  b) Doesn't allow the propagation of some heights
     /// Ensures that the block production doesn't get stuck.
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_catchup_sanity_blocks_produced_doomslug() {
         let validator_groups = 2;
         init_integration_logger();
@@ -750,7 +737,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_chunk_grieving() {
         let validator_groups = 1;
         init_integration_logger();
@@ -894,24 +880,16 @@ mod tests {
     }
 
     #[test]
-    fn test_all_chunks_accepted_10() {
-        test_all_chunks_accepted_common(10, 2000, 5)
-    }
-
-    #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_all_chunks_accepted_1000() {
         test_all_chunks_accepted_common(1000, 2000, 5)
     }
 
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_all_chunks_accepted_1000_slow() {
         test_all_chunks_accepted_common(1000, 4000, 5)
     }
 
     #[test]
-    #[cfg(feature = "expensive_tests")]
     fn test_all_chunks_accepted_1000_rare_epoch_changing() {
         test_all_chunks_accepted_common(1000, 1000, 100)
     }