cleanup

solana-labs · Apr 25, 2020 · 57be116 · 57be116
1 parent 55dd5a2
commit 57be116
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -1683,8 +1683,8 @@ impl Bank {
             .fetch_add(collected_rent, Ordering::Relaxed);
     }
 
-    fn collect_rent_in_partition(&self, (range_start, range_end, partition_count): Partition) {
-        let subrange = Self::pubkey_range_by_partition(range_start, range_end, partition_count);
+    fn collect_rent_in_partition(&self, partition: Partition) {
+        let subrange = Self::pubkey_range_by_partition(partition);
 
         let accounts = self
             .rc
@@ -1706,9 +1706,7 @@ impl Bank {
     }
 
     fn pubkey_range_by_partition(
-        start_index: PartitionIndex,
-        end_index: PartitionIndex,
-        partition_count: PartitionsPerCycle,
+        (start_index, end_index, partition_count): Partition,
     ) -> std::ops::RangeInclusive<Pubkey> {
         type Prefix = u64;
         const PREFIX_SIZE: usize = mem::size_of::<Prefix>();
@@ -3786,7 +3784,7 @@ mod tests {
 
     #[test]
     fn test_rent_eager_pubkey_range_minimal() {
-        let range = Bank::pubkey_range_by_partition(0, 0, 1);
+        let range = Bank::pubkey_range_by_partition((0, 0, 1));
         assert_eq!(
             range,
             Pubkey::new_from_array([0x00; 32])..=Pubkey::new_from_array([0xff; 32])
@@ -3795,7 +3793,7 @@ mod tests {
 
     #[test]
     fn test_rent_eager_pubkey_range_dividable() {
-        let range = Bank::pubkey_range_by_partition(0, 0, 2);
+        let range = Bank::pubkey_range_by_partition((0, 0, 2));
         assert_eq!(
             range,
             Pubkey::new_from_array([
@@ -3810,7 +3808,7 @@ mod tests {
                 ])
         );
 
-        let range = Bank::pubkey_range_by_partition(0, 1, 2);
+        let range = Bank::pubkey_range_by_partition((0, 1, 2));
         assert_eq!(
             range,
             Pubkey::new_from_array([
@@ -3830,7 +3828,7 @@ mod tests {
     fn test_rent_eager_pubkey_range_not_dividable() {
         solana_logger::setup();
 
-        let range = Bank::pubkey_range_by_partition(0, 0, 3);
+        let range = Bank::pubkey_range_by_partition((0, 0, 3));
         assert_eq!(
             range,
             Pubkey::new_from_array([
@@ -3845,7 +3843,7 @@ mod tests {
                 ])
         );
 
-        let range = Bank::pubkey_range_by_partition(0, 1, 3);
+        let range = Bank::pubkey_range_by_partition((0, 1, 3));
         assert_eq!(
             range,
             Pubkey::new_from_array([
@@ -3860,7 +3858,7 @@ mod tests {
                 ])
         );
 
-        let range = Bank::pubkey_range_by_partition(1, 2, 3);
+        let range = Bank::pubkey_range_by_partition((1, 2, 3));
         assert_eq!(
             range,
             Pubkey::new_from_array([
@@ -3879,7 +3877,7 @@ mod tests {
     #[test]
     fn test_rent_eager_pubkey_range_gap() {
         solana_logger::setup();
-        let range = Bank::pubkey_range_by_partition(120, 1023, 12345);
+        let range = Bank::pubkey_range_by_partition((120, 1023, 12345));
         assert_eq!(
             range,
             Pubkey::new_from_array([