tests: rm redundant, clean up bincode gating

Author: rustopian

sysvar/src/clock.rs

@@ -141,23 +141,18 @@ mod tests {
     use {super::*, crate::tests::to_bytes, serial_test::serial};
 
     #[test]
+    #[cfg(feature = "bincode")]
     fn test_clock_size_matches_bincode() {
         // Prove that Clock's in-memory layout matches its bincode serialization,
         // so we do not need to use sysvar_packed_struct.
         let clock = Clock::default();
         let in_memory_size = core::mem::size_of::<Clock>();
+        let bincode_size = bincode::serialized_size(&clock).unwrap() as usize;
 
-        #[cfg(feature = "bincode")]
-        {
-            let bincode_size = bincode::serialized_size(&clock).unwrap() as usize;
-            assert_eq!(
-                in_memory_size, bincode_size,
-                "Clock in-memory size ({in_memory_size}) must match bincode size ({bincode_size})",
-            );
-        }
-
-        // Clock is 5 u64s = 40 bytes
-        assert_eq!(in_memory_size, 40);
+        assert_eq!(
+            in_memory_size, bincode_size,
+            "Clock in-memory size ({in_memory_size}) must match bincode size ({bincode_size})",
+        );
     }
 
     #[test]

sysvar/src/epoch_rewards.rs

@@ -214,11 +214,6 @@ impl SysvarSerialize for EpochRewards {}
 mod tests {
     use {super::*, crate::Sysvar, serial_test::serial};
 
-    #[test]
-    fn test_epoch_rewards_packed_size() {
-        assert_eq!(core::mem::size_of::<EpochRewardsPacked>(), 81);
-    }
-
     #[test]
     #[serial]
     #[cfg(feature = "bincode")]

sysvar/src/epoch_schedule.rs

@@ -173,11 +173,6 @@ impl SysvarSerialize for EpochSchedule {}
 mod tests {
     use {super::*, crate::Sysvar, serial_test::serial};
 
-    #[test]
-    fn test_epoch_schedule_packed_size() {
-        assert_eq!(core::mem::size_of::<EpochSchedulePacked>(), 33);
-    }
-
     #[test]
     #[serial]
     #[cfg(feature = "bincode")]

sysvar/src/last_restart_slot.rs

@@ -56,23 +56,18 @@ mod tests {
     use {super::*, crate::tests::to_bytes, serial_test::serial};
 
     #[test]
+    #[cfg(feature = "bincode")]
     fn test_last_restart_slot_size_matches_bincode() {
         // Prove that LastRestartSlot's in-memory layout matches its bincode serialization,
         // so we do not need to use sysvar_packed_struct.
         let slot = LastRestartSlot::default();
         let in_memory_size = core::mem::size_of::<LastRestartSlot>();
+        let bincode_size = bincode::serialized_size(&slot).unwrap() as usize;
 
-        #[cfg(feature = "bincode")]
-        {
-            let bincode_size = bincode::serialized_size(&slot).unwrap() as usize;
-            assert_eq!(
-                in_memory_size, bincode_size,
-                "LastRestartSlot in-memory size ({in_memory_size}) must match bincode size ({bincode_size})",
-            );
-        }
-
-        // LastRestartSlot is 1 u64 = 8 bytes
-        assert_eq!(in_memory_size, 8);
+        assert_eq!(
+            in_memory_size, bincode_size,
+            "LastRestartSlot in-memory size ({in_memory_size}) must match bincode size ({bincode_size})",
+        );
     }
 
     #[test]

sysvar/src/rent.rs

@@ -169,11 +169,6 @@ impl SysvarSerialize for Rent {}
 mod tests {
     use {super::*, crate::Sysvar, serial_test::serial};
 
-    #[test]
-    fn test_rent_packed_size() {
-        assert_eq!(core::mem::size_of::<RentPacked>(), 17);
-    }
-
     #[test]
     #[serial]
     #[cfg(feature = "bincode")]