rename uint_new back to uint

scroll-tech · Jul 12, 2024 · 189ad7f · 189ad7f
1 parent a349701
commit 189ad7f
Show file tree

Hide file tree

Showing 30 changed files with 40 additions and 40 deletions.
diff --git a/singer-pro/src/basic_block/bb_final.rs b/singer-pro/src/basic_block/bb_final.rs
@@ -4,7 +4,7 @@ use gkr::structs::Circuit;
 use itertools::Itertools;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         GlobalStateChipOperations, OAMOperations, ROMOperations, RangeChipOperations,

diff --git a/singer-pro/src/basic_block/bb_start.rs b/singer-pro/src/basic_block/bb_start.rs
@@ -3,7 +3,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         GlobalStateChipOperations, OAMOperations, ROMOperations, RangeChipOperations,

diff --git a/singer-pro/src/instructions/add.rs b/singer-pro/src/instructions/add.rs
@@ -2,7 +2,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::CircuitBuilder;
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::ROMOperations,
     chips::IntoEnumIterator,

diff --git a/singer-pro/src/instructions/gt.rs b/singer-pro/src/instructions/gt.rs
@@ -2,7 +2,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::CircuitBuilder;
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::ROMOperations,
     chips::IntoEnumIterator,

diff --git a/singer-pro/src/instructions/mstore.rs b/singer-pro/src/instructions/mstore.rs
@@ -10,7 +10,7 @@ use singer_utils::{
     constants::{OpcodeType, EVM_STACK_BYTE_WIDTH},
     register_witness,
     structs::{ChipChallenges, InstOutChipType, RAMHandler, ROMHandler, StackUInt, TSUInt},
-    uint_new::constants::AddSubConstants,
+    uint::constants::AddSubConstants,
 };
 use std::{mem, sync::Arc};
 

diff --git a/singer-pro/src/instructions/ret.rs b/singer-pro/src/instructions/ret.rs
@@ -3,7 +3,7 @@ use gkr::structs::Circuit;
 use gkr_graph::structs::{CircuitGraphBuilder, NodeOutputType, PredType};
 use paste::paste;
 use simple_frontend::structs::CircuitBuilder;
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{OAMOperations, ROMOperations},
     chips::{IntoEnumIterator, SingerChipBuilder},

diff --git a/singer-utils/src/chip_handler.rs b/singer-utils/src/chip_handler.rs
@@ -1,7 +1,7 @@
 use ff_ext::ExtensionField;
 use simple_frontend::structs::{CellId, ChallengeId, CircuitBuilder, MixedCell, WitnessId};
 
-use crate::{constants::OpcodeType, error::UtilError, structs::ChipChallenges, uint_new::UInt};
+use crate::{constants::OpcodeType, error::UtilError, structs::ChipChallenges, uint::UInt};
 
 pub mod bytecode;
 pub mod calldata;

diff --git a/singer-utils/src/chip_handler/range.rs b/singer-utils/src/chip_handler/range.rs
@@ -6,7 +6,7 @@ use crate::{
     constants::{RANGE_CHIP_BIT_WIDTH, STACK_TOP_BIT_WIDTH},
     error::UtilError,
     structs::{PCUInt, ROMHandler, TSUInt},
-    uint_new::UInt,
+    uint::UInt,
 };
 
 use super::{ROMOperations, RangeChipOperations};

diff --git a/singer-utils/src/lib.rs b/singer-utils/src/lib.rs
@@ -5,7 +5,7 @@ pub mod chips;
 pub mod constants;
 pub mod error;
 pub mod structs;
-pub mod uint_new;
+pub mod uint;
 
 #[macro_use]
 pub mod macros;
diff --git a/singer-utils/src/structs.rs b/singer-utils/src/structs.rs
@@ -1,10 +1,10 @@
 use ff_ext::ExtensionField;
 use simple_frontend::structs::{CellId, ChallengeId, ExtCellId};
 use strum_macros::EnumIter;
-use uint_new::UInt;
+use uint::UInt;
 
 use crate::constants::{EVM_STACK_BIT_WIDTH, VALUE_BIT_WIDTH};
-use crate::uint_new;
+use crate::uint;
 
 #[derive(Clone, Debug, Copy, EnumIter)]
 pub enum RAMType {

diff --git a/singer-utils/src/uint_new.rs → singer-utils/src/uint.rs b/singer-utils/src/uint_new.rs → singer-utils/src/uint.rs
diff --git a/singer-utils/src/uint_new/arithmetic.rs → singer-utils/src/uint/arithmetic.rs b/singer-utils/src/uint_new/arithmetic.rs → singer-utils/src/uint/arithmetic.rs
@@ -1,4 +1,4 @@
-use crate::{chip_handler::RangeChipOperations, error::UtilError, uint_new::uint::UInt};
+use crate::{chip_handler::RangeChipOperations, error::UtilError, uint::uint::UInt};
 use ff::Field;
 use ff_ext::ExtensionField;
 use simple_frontend::structs::{Cell, CellId, CircuitBuilder};
@@ -292,7 +292,7 @@ impl<const M: usize, const C: usize> UInt<M, C> {
 
 #[cfg(test)]
 mod tests {
-    use crate::uint_new::{constants::AddSubConstants, UInt};
+    use crate::uint::{constants::AddSubConstants, UInt};
     use gkr::structs::{Circuit, CircuitWitness};
     use goldilocks::{Goldilocks, GoldilocksExt2};
     use itertools::Itertools;
@@ -328,8 +328,8 @@ mod tests {
         let (carry_id, carry_cells) =
             circuit_builder.create_witness_in(AddSubConstants::<UInt20>::N_CARRY_CELLS);
 
-        let addend_0 = UInt20::try_from(addend_0_cells).expect("should build uint_new");
-        let addend_1 = UInt20::try_from(addend_1_cells).expect("should build uint_new");
+        let addend_0 = UInt20::try_from(addend_0_cells).expect("should build uint");
+        let addend_1 = UInt20::try_from(addend_1_cells).expect("should build uint");
 
         // update circuit builder with circuit instructions
         let result =
@@ -403,7 +403,7 @@ mod tests {
         let (carry_id, carry_cells) =
             circuit_builder.create_witness_in(AddSubConstants::<UInt20>::N_CARRY_CELLS);
 
-        let addend_0 = UInt20::try_from(addend_0_cells).expect("should build uint_new");
+        let addend_0 = UInt20::try_from(addend_0_cells).expect("should build uint");
 
         // update circuit builder
         let result = UInt20::add_const_unsafe(
@@ -477,7 +477,7 @@ mod tests {
         let (carry_id, carry_cells) =
             circuit_builder.create_witness_in(AddSubConstants::<UInt20>::N_CARRY_CELLS);
 
-        let addend_0 = UInt20::try_from(addend_0_cells).expect("should build uint_new");
+        let addend_0 = UInt20::try_from(addend_0_cells).expect("should build uint");
 
         // update circuit builder
         let result = UInt20::add_cell_unsafe(
@@ -555,8 +555,8 @@ mod tests {
         let (borrow_id, borrow_cells) =
             circuit_builder.create_witness_in(AddSubConstants::<UInt20>::N_CARRY_CELLS);
 
-        let minuend = UInt20::try_from(minuend_cells).expect("should build uint_new");
-        let subtrahend = UInt20::try_from(subtrahend_cells).expect("should build uint_new");
+        let minuend = UInt20::try_from(minuend_cells).expect("should build uint");
+        let subtrahend = UInt20::try_from(subtrahend_cells).expect("should build uint");
 
         // update the circuit builder
         let result =

diff --git a/singer-utils/src/uint_new/cmp.rs → singer-utils/src/uint/cmp.rs b/singer-utils/src/uint_new/cmp.rs → singer-utils/src/uint/cmp.rs
@@ -1,7 +1,7 @@
 use crate::{
     chip_handler::RangeChipOperations,
     error::UtilError,
-    uint_new::{constants::AddSubConstants, uint::UInt},
+    uint::{constants::AddSubConstants, uint::UInt},
 };
 use ff::Field;
 use ff_ext::ExtensionField;

diff --git a/singer-utils/src/uint_new/constants.rs → singer-utils/src/uint/constants.rs b/singer-utils/src/uint_new/constants.rs → singer-utils/src/uint/constants.rs
@@ -1,6 +1,6 @@
 use super::uint::UInt;
 use crate::constants::RANGE_CHIP_BIT_WIDTH;
-use crate::uint_new::util::const_min;
+use crate::uint::util::const_min;
 use std::marker::PhantomData;
 
 impl<const M: usize, const C: usize> UInt<M, C> {

diff --git a/singer-utils/src/uint_new/uint.rs → singer-utils/src/uint/uint.rs b/singer-utils/src/uint_new/uint.rs → singer-utils/src/uint/uint.rs
@@ -1,7 +1,7 @@
 use crate::{
     constants::{BYTE_BIT_WIDTH, RANGE_CHIP_BIT_WIDTH},
     error::UtilError,
-    uint_new::util::{add_one_to_big_num, convert_decomp, pad_cells},
+    uint::util::{add_one_to_big_num, convert_decomp, pad_cells},
 };
 use ff_ext::ExtensionField;
 use goldilocks::SmallField;
@@ -134,7 +134,7 @@ impl<const M: usize, const C: usize> TryFrom<&[CellId]> for UInt<M, C> {
 
 #[cfg(test)]
 mod tests {
-    use crate::uint_new::uint::UInt;
+    use crate::uint::uint::UInt;
     use gkr::structs::{Circuit, CircuitWitness};
     use goldilocks::{Goldilocks, GoldilocksExt2};
     use itertools::Itertools;

diff --git a/singer-utils/src/uint_new/util.rs → singer-utils/src/uint/util.rs b/singer-utils/src/uint_new/util.rs → singer-utils/src/uint/util.rs
@@ -107,7 +107,7 @@ pub fn add_one_to_big_num<F: SmallField>(limb_modulo: F, limbs: &[F]) -> Vec<F>
 
 #[cfg(test)]
 mod tests {
-    use crate::uint_new::util::{add_one_to_big_num, const_min, convert_decomp, pad_cells};
+    use crate::uint::util::{add_one_to_big_num, const_min, convert_decomp, pad_cells};
     use gkr::structs::{Circuit, CircuitWitness};
     use goldilocks::{Goldilocks, GoldilocksExt2};
     use itertools::Itertools;

diff --git a/...-utils/src/uint_new/witness_extractors.rs → singer-utils/src/uint/witness_extractors.rs b/...-utils/src/uint_new/witness_extractors.rs → singer-utils/src/uint/witness_extractors.rs
@@ -1,5 +1,5 @@
-use crate::uint_new::constants::AddSubConstants;
-use crate::uint_new::uint::UInt;
+use crate::uint::constants::AddSubConstants;
+use crate::uint::uint::UInt;
 use simple_frontend::structs::CellId;
 
 // TODO: split this into different impls, constrained by specific contexts

diff --git a/singer/src/instructions/add.rs b/singer/src/instructions/add.rs
@@ -11,7 +11,7 @@ use singer_utils::{
     constants::OpcodeType,
     register_witness,
     structs::{PCUInt, RAMHandler, ROMHandler, StackUInt, TSUInt},
-    uint_new::constants::AddSubConstants,
+    uint::constants::AddSubConstants,
 };
 use std::sync::Arc;
 
@@ -190,7 +190,7 @@ mod test {
     use singer_utils::{
         constants::RANGE_CHIP_BIT_WIDTH,
         structs::{StackUInt, TSUInt},
-        uint_new::constants::AddSubConstants,
+        uint::constants::AddSubConstants,
     };
     use std::{collections::BTreeMap, time::Instant};
     use transcript::Transcript;

diff --git a/singer/src/instructions/calldataload.rs b/singer/src/instructions/calldataload.rs
@@ -3,7 +3,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, CalldataChipOperations, GlobalStateChipOperations, OAMOperations,

diff --git a/singer/src/instructions/dup.rs b/singer/src/instructions/dup.rs
@@ -3,7 +3,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, GlobalStateChipOperations, OAMOperations, ROMOperations,

diff --git a/singer/src/instructions/gt.rs b/singer/src/instructions/gt.rs
@@ -3,7 +3,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, GlobalStateChipOperations, OAMOperations, ROMOperations,

diff --git a/singer/src/instructions/jump.rs b/singer/src/instructions/jump.rs
@@ -5,7 +5,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, GlobalStateChipOperations, OAMOperations, ROMOperations,

diff --git a/singer/src/instructions/jumpdest.rs b/singer/src/instructions/jumpdest.rs
@@ -3,7 +3,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, GlobalStateChipOperations, OAMOperations, ROMOperations,

diff --git a/singer/src/instructions/jumpi.rs b/singer/src/instructions/jumpi.rs
@@ -12,7 +12,7 @@ use singer_utils::{
     constants::OpcodeType,
     register_witness,
     structs::{PCUInt, RAMHandler, ROMHandler, StackUInt, TSUInt},
-    uint_new::constants::AddSubConstants,
+    uint::constants::AddSubConstants,
 };
 use std::sync::Arc;
 

diff --git a/singer/src/instructions/mstore.rs b/singer/src/instructions/mstore.rs
@@ -13,7 +13,7 @@ use singer_utils::{
     constants::{OpcodeType, EVM_STACK_BYTE_WIDTH},
     register_witness,
     structs::{PCUInt, RAMHandler, ROMHandler, StackUInt, TSUInt},
-    uint_new::constants::AddSubConstants,
+    uint::constants::AddSubConstants,
 };
 use std::{mem, sync::Arc};
 

diff --git a/singer/src/instructions/pop.rs b/singer/src/instructions/pop.rs
@@ -3,7 +3,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, GlobalStateChipOperations, OAMOperations, ROMOperations,

diff --git a/singer/src/instructions/push.rs b/singer/src/instructions/push.rs
@@ -3,7 +3,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, GlobalStateChipOperations, OAMOperations, ROMOperations,

diff --git a/singer/src/instructions/ret.rs b/singer/src/instructions/ret.rs
@@ -4,7 +4,7 @@ use gkr::structs::Circuit;
 use gkr_graph::structs::{CircuitGraphBuilder, NodeOutputType, PredType};
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, GlobalStateChipOperations, OAMOperations, ROMOperations,

diff --git a/singer/src/instructions/swap.rs b/singer/src/instructions/swap.rs
@@ -3,7 +3,7 @@ use ff_ext::ExtensionField;
 use gkr::structs::Circuit;
 use paste::paste;
 use simple_frontend::structs::{CircuitBuilder, MixedCell};
-use singer_utils::uint_new::constants::AddSubConstants;
+use singer_utils::uint::constants::AddSubConstants;
 use singer_utils::{
     chip_handler::{
         BytecodeChipOperations, GlobalStateChipOperations, OAMOperations, ROMOperations,

diff --git a/singer/src/test.rs b/singer/src/test.rs
@@ -7,7 +7,7 @@ use gkr::utils::MultilinearExtensionFromVectors;
 use goldilocks::SmallField;
 use itertools::Itertools;
 use simple_frontend::structs::CellId;
-use singer_utils::uint_new::UInt;
+use singer_utils::uint::UInt;
 use std::collections::BTreeMap;
 
 use crate::instructions::InstCircuit;