From ee54b295d9c478ab4e0c1175c788fefbaea237a3 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Thu, 29 Sep 2022 15:24:43 +0200 Subject: [PATCH] Use u64 instead of usize --- plonky2/src/gates/base_sum.rs | 2 +- util/src/lib.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plonky2/src/gates/base_sum.rs b/plonky2/src/gates/base_sum.rs index 93ac7e8d..5be54eeb 100644 --- a/plonky2/src/gates/base_sum.rs +++ b/plonky2/src/gates/base_sum.rs @@ -34,7 +34,7 @@ impl BaseSumGate { pub fn new_from_config(config: &CircuitConfig) -> Self { let num_limbs = - log_floor(F::ORDER as usize - 1, B).min(config.num_routed_wires - Self::START_LIMBS); + log_floor(F::ORDER - 1, B as u64).min(config.num_routed_wires - Self::START_LIMBS); Self::new(num_limbs) } diff --git a/util/src/lib.rs b/util/src/lib.rs index 3136a4b2..bbc2af98 100644 --- a/util/src/lib.rs +++ b/util/src/lib.rs @@ -39,11 +39,11 @@ pub fn log2_strict(n: usize) -> usize { } /// Returns the largest integer `i` such that `base**i <= n`. -pub const fn log_floor(n: usize, base: usize) -> usize { +pub const fn log_floor(n: u64, base: u64) -> usize { assert!(n > 0); assert!(base > 1); let mut i = 0; - let mut cur: usize = 1; + let mut cur: u64 = 1; loop { let (mul, overflow) = cur.overflowing_mul(base); if overflow || mul > n {