backward compatible new, burn check, bool >1 handling for active

Author: rustopian

epoch-rewards/src/lib.rs

@@ -80,26 +80,23 @@ impl EpochRewards {
     }
 
     pub fn active(&self) -> bool {
-        self.active != 0
+        match self.active {
+            0 => false,
+            1 => true,
+            _ => panic!("invalid active value"),
+        }
     }
 
     pub fn new(
-        distribution_starting_block_height: u64,
-        num_partitions: u64,
-        parent_blockhash: Hash,
-        total_points: u128,
         total_rewards: u64,
         distributed_rewards: u64,
-        active: bool,
+        distribution_starting_block_height: u64,
     ) -> Self {
         Self {
             distribution_starting_block_height: distribution_starting_block_height.to_le_bytes(),
-            num_partitions: num_partitions.to_le_bytes(),
-            parent_blockhash,
-            total_points: total_points.to_le_bytes(),
             total_rewards: total_rewards.to_le_bytes(),
             distributed_rewards: distributed_rewards.to_le_bytes(),
-            active: active as u8,
+            ..Self::default()
         }
     }
 
@@ -116,7 +113,7 @@ mod tests {
 
     #[test]
     fn test_epoch_rewards_distribute() {
-        let mut epoch_rewards = EpochRewards::new(64, 0, Hash::default(), 0, 100, 0, false);
+        let mut epoch_rewards = EpochRewards::new(100, 0, 64);
         epoch_rewards.distribute(100);
 
         assert_eq!(epoch_rewards.total_rewards(), 100);
@@ -126,7 +123,7 @@ mod tests {
     #[test]
     #[should_panic(expected = "new_distributed_rewards <= self.total_rewards")]
     fn test_epoch_rewards_distribute_panic() {
-        let mut epoch_rewards = EpochRewards::new(64, 0, Hash::default(), 0, 100, 0, false);
+        let mut epoch_rewards = EpochRewards::new(100, 0, 64);
         epoch_rewards.distribute(200);
     }
 }

rent/src/lib.rs

@@ -93,7 +93,16 @@ impl Rent {
         self.burn_percent
     }
 
+    /// Creates a new `Rent` with the given parameters.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `burn_percent` is not in the range [0, 100].
     pub fn new(lamports_per_byte_year: u64, exemption_threshold: f64, burn_percent: u8) -> Self {
+        assert!(
+            burn_percent <= 100,
+            "burn_percent must be in range [0, 100]"
+        );
         Self {
             lamports_per_byte_year: lamports_per_byte_year.to_le_bytes(),
             exemption_threshold: exemption_threshold.to_le_bytes(),

sysvar/src/epoch_rewards.rs

@@ -47,10 +47,9 @@
 //! }
 //! #
 //! # use solana_sysvar_id::SysvarId;
-//! # use solana_hash::Hash;
 //! # let p = EpochRewards::id();
 //! # let l = &mut 1559040;
-//! # let epoch_rewards = EpochRewards::new(42, 0, Hash::default(), 0, 100, 10, true);
+//! # let epoch_rewards = EpochRewards::new(100, 10, 42);
 //! # let mut d: Vec<u8> = bincode::serialize(&epoch_rewards).unwrap();
 //! # let a = AccountInfo::new(&p, false, false, l, &mut d, &p, false);
 //! # let accounts = &[a.clone(), a];
@@ -90,10 +89,9 @@
 //! }
 //! #
 //! # use solana_sysvar_id::SysvarId;
-//! # use solana_hash::Hash;
 //! # let p = EpochRewards::id();
 //! # let l = &mut 1559040;
-//! # let epoch_rewards = EpochRewards::new(42, 0, Hash::default(), 0, 100, 10, true);
+//! # let epoch_rewards = EpochRewards::new(100, 10, 42);
 //! # let mut d: Vec<u8> = bincode::serialize(&epoch_rewards).unwrap();
 //! # let a = AccountInfo::new(&p, false, false, l, &mut d, &p, false);
 //! # let accounts = &[a.clone(), a];
@@ -117,8 +115,7 @@
 //! # use anyhow::Result;
 //! #
 //! fn print_sysvar_epoch_rewards(client: &RpcClient) -> Result<()> {
-//! #   use solana_hash::Hash;
-//! #   let epoch_rewards = EpochRewards::new(42, 0, Hash::default(), 0, 100, 10, true);
+//! #   let epoch_rewards = EpochRewards::new(100, 10, 42);
 //! #   let data: Vec<u8> = bincode::serialize(&epoch_rewards)?;
 //! #   client.set_get_account_response(epoch_rewards::ID, Account {
 //! #       lamports: 1120560,
@@ -162,15 +159,7 @@ mod tests {
     #[serial]
     #[cfg(feature = "bincode")]
     fn test_epoch_rewards_get() {
-        let expected = EpochRewards::new(
-            42,
-            7,
-            solana_hash::Hash::new_unique(),
-            1234567890,
-            100,
-            10,
-            true,
-        );
+        let expected = EpochRewards::new(100, 10, 42);
 
         let data = bincode::serialize(&expected).unwrap();
         assert_eq!(data.len(), 81);