From fe63a19539e060a7ac8c3bff06a5636eee4bc74d Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Fri, 28 Feb 2020 11:02:01 -0700
Subject: [PATCH] Use a more portable integer for `target_signatures_per_slot`

---
 genesis/src/main.rs       |  2 +-
 runtime/src/bank.rs       |  2 +-
 sdk/src/fee_calculator.rs | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/genesis/src/main.rs b/genesis/src/main.rs
index 57d62406bf9b41..523a90a8828028 100644
--- a/genesis/src/main.rs
+++ b/genesis/src/main.rs
@@ -451,7 +451,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
 
     let mut fee_rate_governor = FeeRateGovernor::new(
         value_t_or_exit!(matches, "target_lamports_per_signature", u64),
-        value_t_or_exit!(matches, "target_signatures_per_slot", usize),
+        value_t_or_exit!(matches, "target_signatures_per_slot", u64),
     );
     fee_rate_governor.burn_percent = value_t_or_exit!(matches, "fee_burn_percentage", u8);
 
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 629384a593295c..d9a3bc9262eb89 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -405,7 +405,7 @@ impl Bank {
         let epoch = epoch_schedule.get_epoch(slot);
 
         let fee_rate_governor =
-            FeeRateGovernor::new_derived(&parent.fee_rate_governor, parent.signature_count() as usize);
+            FeeRateGovernor::new_derived(&parent.fee_rate_governor, parent.signature_count());
 
         let mut new = Bank {
             rc,
diff --git a/sdk/src/fee_calculator.rs b/sdk/src/fee_calculator.rs
index 29af32c715a80a..173dc53a334cf8 100644
--- a/sdk/src/fee_calculator.rs
+++ b/sdk/src/fee_calculator.rs
@@ -44,7 +44,7 @@ pub struct FeeRateGovernor {
     // Used to estimate the desired processing capacity of the cluster.  As the signatures for
     // recent slots are fewer/greater than this value, lamports_per_signature will decrease/increase
     // for the next slot.  A value of 0 disables lamports_per_signature fee adjustments
-    pub target_signatures_per_slot: usize,
+    pub target_signatures_per_slot: u64,
 
     pub min_lamports_per_signature: u64,
     pub max_lamports_per_signature: u64,
@@ -54,8 +54,8 @@ pub struct FeeRateGovernor {
 }
 
 pub const DEFAULT_TARGET_LAMPORTS_PER_SIGNATURE: u64 = 10_000;
-pub const DEFAULT_TARGET_SIGNATURES_PER_SLOT: usize =
-    50_000 * DEFAULT_TICKS_PER_SLOT as usize / DEFAULT_TICKS_PER_SECOND as usize;
+pub const DEFAULT_TARGET_SIGNATURES_PER_SLOT: u64 =
+    50_000 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND;
 
 // Percentage of tx fees to burn
 pub const DEFAULT_BURN_PERCENT: u8 = 50;
@@ -74,7 +74,7 @@ impl Default for FeeRateGovernor {
 }
 
 impl FeeRateGovernor {
-    pub fn new(target_lamports_per_signature: u64, target_signatures_per_slot: usize) -> Self {
+    pub fn new(target_lamports_per_signature: u64, target_signatures_per_slot: u64) -> Self {
         let base_fee_rate_governor = Self {
             target_lamports_per_signature,
             lamports_per_signature: target_lamports_per_signature,
@@ -87,7 +87,7 @@ impl FeeRateGovernor {
 
     pub fn new_derived(
         base_fee_rate_governor: &FeeRateGovernor,
-        latest_signatures_per_slot: usize,
+        latest_signatures_per_slot: u64,
     ) -> Self {
         let mut me = base_fee_rate_governor.clone();
 
@@ -102,7 +102,7 @@ impl FeeRateGovernor {
                 me.max_lamports_per_signature
                     .min(me.min_lamports_per_signature.max(
                         me.target_lamports_per_signature
-                            * std::cmp::min(latest_signatures_per_slot, std::u32::MAX as usize)
+                            * std::cmp::min(latest_signatures_per_slot, std::u32::MAX as u64)
                                 as u64
                             / me.target_signatures_per_slot as u64,
                     ));
@@ -246,7 +246,7 @@ mod tests {
         loop {
             let last_lamports_per_signature = f.lamports_per_signature;
 
-            f = FeeRateGovernor::new_derived(&f, std::usize::MAX);
+            f = FeeRateGovernor::new_derived(&f, std::u64::MAX);
             info!("[up] f.lamports_per_signature={}", f.lamports_per_signature);
 
             // some maximum target reached