diff --git a/felt/src/bigint_felt.rs b/felt/src/bigint_felt.rs index ffc8563dc0..93a49301bb 100644 --- a/felt/src/bigint_felt.rs +++ b/felt/src/bigint_felt.rs @@ -13,7 +13,7 @@ use std::{ }, }; -use crate::{FeltOps, NewFelt, ParseFeltError, FIELD_HIGH, FIELD_LOW}; +use crate::{FeltOps, ParseFeltError, FIELD_HIGH, FIELD_LOW}; lazy_static! { pub static ref CAIRO_PRIME: BigUint = @@ -125,13 +125,11 @@ impl From<&BigInt> for FeltBigInt { } } -impl NewFelt for FeltBigInt { +impl FeltOps for FeltBigInt { fn new>(value: T) -> Self { value.into() } -} -impl FeltOps for FeltBigInt { fn modpow(&self, exponent: &FeltBigInt, modulus: &FeltBigInt) -> Self { FeltBigInt { val: self.val.modpow(&exponent.val, &modulus.val), @@ -825,12 +823,12 @@ impl fmt::Display for ParseFeltError { #[macro_export] macro_rules! felt_str { ($val: expr) => { - >::new( + >::new( num_bigint::BigInt::parse_bytes($val.as_bytes(), 10_u32).expect("Couldn't parse bytes"), ) }; ($val: expr, $opt: expr) => { - >::new( + >::new( num_bigint::BigInt::parse_bytes($val.as_bytes(), $opt as u32) .expect("Couldn't parse bytes"), ) diff --git a/felt/src/lib.rs b/felt/src/lib.rs index c3aca7d006..f2c4835bc3 100644 --- a/felt/src/lib.rs +++ b/felt/src/lib.rs @@ -23,11 +23,8 @@ pub type Felt = FeltBigInt; #[derive(Clone, Debug, PartialEq, Eq)] pub struct ParseFeltError; -pub trait NewFelt { - fn new>>(value: T) -> Self; -} - pub trait FeltOps { + fn new>>(value: T) -> Self; fn modpow(&self, exponent: &FeltBigInt, modulus: &FeltBigInt) -> Self; fn iter_u64_digits(&self) -> U64Digits; fn to_signed_bytes_le(&self) -> Vec; @@ -44,7 +41,6 @@ pub trait FeltOps { macro_rules! assert_felt_impl { ($type:ty) => { const _: () = { - fn assert_new_felt>() {} fn assert_felt_ops>() {} fn assert_add() {} fn assert_add_ref<'a, T: Add<&'a $type>>() {} @@ -92,7 +88,6 @@ macro_rules! assert_felt_impl { // RFC 2056 #[allow(dead_code)] fn assert_all() { - assert_new_felt::<$type>(); assert_felt_ops::<$type>(); assert_add::<$type>(); assert_add::<&$type>(); diff --git a/src/cairo_run.rs b/src/cairo_run.rs index 8014ebe761..ec0e8ff922 100644 --- a/src/cairo_run.rs +++ b/src/cairo_run.rs @@ -141,7 +141,7 @@ mod tests { }, utils::test_utils::*, }; - use felt::NewFelt; + use felt::FeltOps; use std::io::Read; fn run_test_program( diff --git a/src/hint_processor/builtin_hint_processor/blake2s_utils.rs b/src/hint_processor/builtin_hint_processor/blake2s_utils.rs index 4d196df77d..861c2c543e 100644 --- a/src/hint_processor/builtin_hint_processor/blake2s_utils.rs +++ b/src/hint_processor/builtin_hint_processor/blake2s_utils.rs @@ -14,7 +14,7 @@ use crate::{ vm_core::VirtualMachine, }, }; -use felt::{Felt, NewFelt}; +use felt::{Felt, FeltOps}; use num_traits::ToPrimitive; use std::{borrow::Cow, collections::HashMap}; diff --git a/src/hint_processor/builtin_hint_processor/builtin_hint_processor_definition.rs b/src/hint_processor/builtin_hint_processor/builtin_hint_processor_definition.rs index efd742ad4a..c217cce10e 100644 --- a/src/hint_processor/builtin_hint_processor/builtin_hint_processor_definition.rs +++ b/src/hint_processor/builtin_hint_processor/builtin_hint_processor_definition.rs @@ -461,7 +461,7 @@ mod tests { vm_memory::memory::Memory, }, }; - use felt::NewFelt; + use felt::FeltOps; use num_traits::{One, Zero}; use std::any::Any; diff --git a/src/hint_processor/builtin_hint_processor/cairo_keccak/keccak_hints.rs b/src/hint_processor/builtin_hint_processor/cairo_keccak/keccak_hints.rs index 4a21d8caee..866679e936 100644 --- a/src/hint_processor/builtin_hint_processor/cairo_keccak/keccak_hints.rs +++ b/src/hint_processor/builtin_hint_processor/cairo_keccak/keccak_hints.rs @@ -12,7 +12,7 @@ use crate::{ vm_core::VirtualMachine, }, }; -use felt::{Felt, NewFelt}; +use felt::{Felt, FeltOps}; use num_traits::{ToPrimitive, Zero}; use std::{borrow::Cow, collections::HashMap, ops::Add}; diff --git a/src/hint_processor/builtin_hint_processor/find_element_hint.rs b/src/hint_processor/builtin_hint_processor/find_element_hint.rs index bfdccb1ece..26767adf1a 100644 --- a/src/hint_processor/builtin_hint_processor/find_element_hint.rs +++ b/src/hint_processor/builtin_hint_processor/find_element_hint.rs @@ -14,7 +14,7 @@ use crate::{ vm_core::VirtualMachine, }, }; -use felt::{Felt, NewFelt}; +use felt::{Felt, FeltOps}; use num_traits::{Signed, ToPrimitive}; use std::collections::HashMap; diff --git a/src/hint_processor/builtin_hint_processor/hint_utils.rs b/src/hint_processor/builtin_hint_processor/hint_utils.rs index 0b320b62cf..811a5473a2 100644 --- a/src/hint_processor/builtin_hint_processor/hint_utils.rs +++ b/src/hint_processor/builtin_hint_processor/hint_utils.rs @@ -116,7 +116,7 @@ pub fn get_reference_from_var_name<'a>( #[cfg(test)] mod tests { - use felt::NewFelt; + use felt::FeltOps; use super::*; use crate::{ diff --git a/src/hint_processor/builtin_hint_processor/math_utils.rs b/src/hint_processor/builtin_hint_processor/math_utils.rs index 59dc06b92e..45b70e922b 100644 --- a/src/hint_processor/builtin_hint_processor/math_utils.rs +++ b/src/hint_processor/builtin_hint_processor/math_utils.rs @@ -15,7 +15,7 @@ use crate::{ vm_core::VirtualMachine, }, }; -use felt::{Felt, FeltOps, NewFelt, PRIME_STR}; +use felt::{Felt, FeltOps, PRIME_STR}; use num_bigint::BigUint; use num_integer::Integer; use num_traits::One; diff --git a/src/hint_processor/builtin_hint_processor/memcpy_hint_utils.rs b/src/hint_processor/builtin_hint_processor/memcpy_hint_utils.rs index 5b8fb3ba84..17a0025107 100644 --- a/src/hint_processor/builtin_hint_processor/memcpy_hint_utils.rs +++ b/src/hint_processor/builtin_hint_processor/memcpy_hint_utils.rs @@ -82,7 +82,7 @@ mod tests { vm_memory::memory::Memory, }, }; - use felt::NewFelt; + use felt::FeltOps; #[test] fn get_integer_from_var_name_valid() { diff --git a/src/hint_processor/builtin_hint_processor/memset_utils.rs b/src/hint_processor/builtin_hint_processor/memset_utils.rs index f2e4cc851a..b1384d6867 100644 --- a/src/hint_processor/builtin_hint_processor/memset_utils.rs +++ b/src/hint_processor/builtin_hint_processor/memset_utils.rs @@ -9,7 +9,7 @@ use crate::{ types::exec_scope::ExecutionScopes, vm::{errors::hint_errors::HintError, vm_core::VirtualMachine}, }; -use felt::{Felt, NewFelt}; +use felt::{Felt, FeltOps}; use num_traits::Signed; use std::{any::Any, collections::HashMap}; diff --git a/src/hint_processor/builtin_hint_processor/pow_utils.rs b/src/hint_processor/builtin_hint_processor/pow_utils.rs index 62ce6f2c17..d1a955457c 100644 --- a/src/hint_processor/builtin_hint_processor/pow_utils.rs +++ b/src/hint_processor/builtin_hint_processor/pow_utils.rs @@ -8,7 +8,7 @@ use crate::{ serde::deserialize_program::ApTracking, vm::{errors::hint_errors::HintError, vm_core::VirtualMachine}, }; -use felt::{Felt, NewFelt}; +use felt::{Felt, FeltOps}; use num_integer::Integer; use std::collections::HashMap; diff --git a/src/hint_processor/builtin_hint_processor/secp/bigint_utils.rs b/src/hint_processor/builtin_hint_processor/secp/bigint_utils.rs index 03ae378b64..5da03e4f39 100644 --- a/src/hint_processor/builtin_hint_processor/secp/bigint_utils.rs +++ b/src/hint_processor/builtin_hint_processor/secp/bigint_utils.rs @@ -13,7 +13,7 @@ use crate::{ vm_core::VirtualMachine, }, }; -use felt::{Felt, NewFelt}; +use felt::{Felt, FeltOps}; use std::collections::HashMap; /* Implements hint: diff --git a/src/hint_processor/builtin_hint_processor/secp/field_utils.rs b/src/hint_processor/builtin_hint_processor/secp/field_utils.rs index 726e3f5e79..e1806ddd8f 100644 --- a/src/hint_processor/builtin_hint_processor/secp/field_utils.rs +++ b/src/hint_processor/builtin_hint_processor/secp/field_utils.rs @@ -12,7 +12,7 @@ use crate::{ types::exec_scope::ExecutionScopes, vm::{errors::hint_errors::HintError, vm_core::VirtualMachine}, }; -use felt::{Felt, FeltOps, NewFelt}; +use felt::{Felt, FeltOps}; use num_bigint::BigInt; use num_integer::Integer; use num_traits::{One, Zero}; @@ -175,7 +175,7 @@ mod tests { vm_memory::memory::Memory, }, }; - use felt::NewFelt; + use felt::FeltOps; use std::any::Any; #[test] diff --git a/src/hint_processor/builtin_hint_processor/secp/secp_utils.rs b/src/hint_processor/builtin_hint_processor/secp/secp_utils.rs index 906eaafdb5..ce8cc27f36 100644 --- a/src/hint_processor/builtin_hint_processor/secp/secp_utils.rs +++ b/src/hint_processor/builtin_hint_processor/secp/secp_utils.rs @@ -93,7 +93,7 @@ pub fn pack_from_relocatable(rel: Relocatable, vm: &VirtualMachine) -> Result #[cfg(test)] mod tests { use super::*; - use felt::NewFelt; + use felt::FeltOps; #[test] fn is_call_instruction_true() { diff --git a/src/types/program.rs b/src/types/program.rs index f0fa6786ca..ba01369b09 100644 --- a/src/types/program.rs +++ b/src/types/program.rs @@ -112,7 +112,7 @@ mod tests { use super::*; use crate::serde::deserialize_program::{ApTracking, FlowTrackingData}; use crate::utils::test_utils::mayberelocatable; - use felt::{felt_str, NewFelt}; + use felt::{felt_str, FeltOps}; use num_traits::Zero; #[test] diff --git a/src/types/relocatable.rs b/src/types/relocatable.rs index 388e6ecbb5..e0de80057e 100644 --- a/src/types/relocatable.rs +++ b/src/types/relocatable.rs @@ -2,7 +2,7 @@ use crate::{ relocatable, vm::errors::{memory_errors::MemoryError, vm_errors::VirtualMachineError}, }; -use felt::{Felt, NewFelt}; +use felt::{Felt, FeltOps}; use num_traits::{FromPrimitive, ToPrimitive, Zero}; use serde::{Deserialize, Serialize}; use std::{ diff --git a/src/utils.rs b/src/utils.rs index 45736a60d0..0c164289ed 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -183,7 +183,7 @@ pub mod test_utils { MaybeRelocatable::from(($val1, $val2)) }; ($val1 : expr) => { - MaybeRelocatable::from(>::new($val1 as i128)) @@ -531,7 +531,7 @@ mod test { vm_core::VirtualMachine, vm_memory::memory::Memory, }, }; - use felt::{Felt, NewFelt}; + use felt::{Felt, FeltOps}; use num_traits::One; use std::{any::Any, cell::RefCell, collections::HashMap, rc::Rc}; diff --git a/src/vm/context/run_context.rs b/src/vm/context/run_context.rs index 9bc6f52cfa..61fd7b9e00 100644 --- a/src/vm/context/run_context.rs +++ b/src/vm/context/run_context.rs @@ -110,7 +110,7 @@ mod tests { use crate::types::instruction::{ApUpdate, FpUpdate, Opcode, PcUpdate, Res}; use crate::utils::test_utils::mayberelocatable; use crate::vm::errors::memory_errors::MemoryError; - use felt::{Felt, NewFelt}; + use felt::{Felt, FeltOps}; #[test] fn compute_dst_addr_for_ap_register() { diff --git a/src/vm/decoding/decoder.rs b/src/vm/decoding/decoder.rs index 5963a4ee0b..064f42cea6 100644 --- a/src/vm/decoding/decoder.rs +++ b/src/vm/decoding/decoder.rs @@ -146,7 +146,7 @@ fn decode_offset(offset: i64) -> isize { #[cfg(test)] mod decoder_test { use super::*; - use felt::NewFelt; + use felt::FeltOps; #[test] fn invalid_op1_reg() { diff --git a/src/vm/runners/builtin_runner/bitwise.rs b/src/vm/runners/builtin_runner/bitwise.rs index b7d1b13a60..de012d8c4d 100644 --- a/src/vm/runners/builtin_runner/bitwise.rs +++ b/src/vm/runners/builtin_runner/bitwise.rs @@ -222,7 +222,7 @@ mod tests { hint_processor::builtin_hint_processor::builtin_hint_processor_definition::BuiltinHintProcessor, types::program::Program, utils::test_utils::*, vm::runners::cairo_runner::CairoRunner, }; - use felt::{Felt, NewFelt}; + use felt::{Felt, FeltOps}; #[test] fn get_used_instances() { diff --git a/src/vm/runners/builtin_runner/ec_op.rs b/src/vm/runners/builtin_runner/ec_op.rs index 519d92cced..996b016bb4 100644 --- a/src/vm/runners/builtin_runner/ec_op.rs +++ b/src/vm/runners/builtin_runner/ec_op.rs @@ -8,7 +8,7 @@ use crate::vm::errors::runner_errors::RunnerError; use crate::vm::vm_core::VirtualMachine; use crate::vm::vm_memory::memory::Memory; use crate::vm::vm_memory::memory_segments::MemorySegmentManager; -use felt::{Felt, FeltOps, NewFelt}; +use felt::{Felt, FeltOps}; use num_bigint::{BigInt, ToBigInt}; use num_integer::{div_ceil, Integer}; use num_traits::{Num, One, Pow, Zero}; diff --git a/src/vm/runners/builtin_runner/keccak.rs b/src/vm/runners/builtin_runner/keccak.rs index 0d9762d75c..acec5ee9d9 100644 --- a/src/vm/runners/builtin_runner/keccak.rs +++ b/src/vm/runners/builtin_runner/keccak.rs @@ -265,7 +265,7 @@ mod tests { runners::builtin_runner::BuiltinRunner, vm_core::VirtualMachine, }; - use felt::NewFelt; + use felt::FeltOps; use std::path::Path; #[test] diff --git a/src/vm/runners/builtin_runner/range_check.rs b/src/vm/runners/builtin_runner/range_check.rs index fa4a4898ac..a7c1190e41 100644 --- a/src/vm/runners/builtin_runner/range_check.rs +++ b/src/vm/runners/builtin_runner/range_check.rs @@ -13,7 +13,7 @@ use crate::{ }, }, }; -use felt::{Felt, NewFelt}; +use felt::{Felt, FeltOps}; use num_integer::Integer; use num_traits::{One, ToPrimitive, Zero}; use std::{ diff --git a/src/vm/runners/cairo_runner.rs b/src/vm/runners/cairo_runner.rs index 8c15613a9e..995054af37 100644 --- a/src/vm/runners/cairo_runner.rs +++ b/src/vm/runners/cairo_runner.rs @@ -1140,7 +1140,7 @@ mod tests { utils::test_utils::*, vm::{trace::trace_entry::TraceEntry, vm_memory::memory::Memory}, }; - use felt::{felt_str, NewFelt}; + use felt::{felt_str, FeltOps}; use num_traits::One; use std::{ collections::{HashMap, HashSet}, diff --git a/src/vm/vm_core.rs b/src/vm/vm_core.rs index 6a761dfaeb..cb0be0aca5 100644 --- a/src/vm/vm_core.rs +++ b/src/vm/vm_core.rs @@ -999,7 +999,7 @@ mod tests { }, }; - use felt::{felt_str, NewFelt}; + use felt::{felt_str, FeltOps}; use std::{collections::HashSet, path::Path}; #[test] diff --git a/src/vm/vm_memory/memory.rs b/src/vm/vm_memory/memory.rs index 255c759fd8..47ca1e407f 100644 --- a/src/vm/vm_memory/memory.rs +++ b/src/vm/vm_memory/memory.rs @@ -375,7 +375,7 @@ mod memory_tests { vm_memory::memory_segments::MemorySegmentManager, }, }; - use felt::{felt_str, NewFelt}; + use felt::{felt_str, FeltOps}; use crate::vm::errors::memory_errors::MemoryError; diff --git a/src/vm/vm_memory/memory_segments.rs b/src/vm/vm_memory/memory_segments.rs index 0065fc50ee..1196d2d215 100644 --- a/src/vm/vm_memory/memory_segments.rs +++ b/src/vm/vm_memory/memory_segments.rs @@ -256,7 +256,7 @@ mod tests { use super::*; use crate::vm::vm_core::VirtualMachine; use crate::{relocatable, utils::test_utils::*}; - use felt::{Felt, NewFelt}; + use felt::{Felt, FeltOps}; use num_traits::Num; use std::vec;