Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 1699488

Browse files
edg-ledg-l
committed
fixes
1 parent 8a1b628 commit 1699488

File tree

6 files changed

+32
-20
lines changed

6 files changed

+32
-20
lines changed

‎src/core/contract_address/sierra_contract_address.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ fn get_contract_entry_points(
140140
#[cfg(test)]
141141
mod tests {
142142
use crate::core::contract_address::compute_sierra_class_hash;
143-
use cairo_lang_starknet::contract_class::ContractClass as SierraContractClass;
143+
use cairo_lang_starknet_classes::contract_class::ContractClass as SierraContractClass;
144144
use cairo_vm::Felt252;
145145
use std::{fs::File, io::BufReader};
146146

‎src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ mod test {
284284
},
285285
},
286286
};
287-
use cairo_lang_starknet::{
287+
use cairo_lang_starknet_classes::{
288288
casm_contract_class::CasmContractClass,
289289
contract_class::ContractClass as SierraContractClass,
290290
};

‎src/syscalls/native_syscall_handler.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,6 +1275,7 @@ mod test {
12751275
fn secp256k1_new() {
12761276
let mut test_ctx = TestContext::default();
12771277
let mut syscall_handler = test_ctx.new_syscall_handler();
1278+
let mut syscall_handler = &mut syscall_handler;
12781279
let mut gas = 0;
12791280

12801281
let p = syscall_handler
@@ -1301,6 +1302,7 @@ mod test {
13011302
fn secp256k1_add() {
13021303
let mut test_ctx = TestContext::default();
13031304
let mut syscall_handler = test_ctx.new_syscall_handler();
1305+
let mut syscall_handler = &mut syscall_handler;
13041306
let mut gas = 0;
13051307

13061308
let p = syscall_handler
@@ -1339,6 +1341,7 @@ mod test {
13391341
fn secp256k1_mul() {
13401342
let mut test_ctx = TestContext::default();
13411343
let mut syscall_handler = test_ctx.new_syscall_handler();
1344+
let mut syscall_handler = &mut syscall_handler;
13421345
let mut gas = 0;
13431346

13441347
let p = syscall_handler
@@ -1371,6 +1374,7 @@ mod test {
13711374
fn secp256k1_get_point_from_x() {
13721375
let mut test_ctx = TestContext::default();
13731376
let mut syscall_handler = test_ctx.new_syscall_handler();
1377+
let mut syscall_handler = &mut syscall_handler;
13741378
let mut gas = 0;
13751379

13761380
let p = syscall_handler
@@ -1394,6 +1398,7 @@ mod test {
13941398
fn secp256k1_get_xy() {
13951399
let mut test_ctx = TestContext::default();
13961400
let mut syscall_handler = test_ctx.new_syscall_handler();
1401+
let mut syscall_handler = &mut syscall_handler;
13971402
let mut gas = 0;
13981403

13991404
let (x, y) = syscall_handler
@@ -1421,6 +1426,7 @@ mod test {
14211426
fn secp256r1_new() {
14221427
let mut test_ctx = TestContext::default();
14231428
let mut syscall_handler = test_ctx.new_syscall_handler();
1429+
let mut syscall_handler = &mut syscall_handler;
14241430
let mut gas = 0;
14251431

14261432
let p = syscall_handler
@@ -1447,6 +1453,7 @@ mod test {
14471453
fn secp256r1_add() {
14481454
let mut test_ctx = TestContext::default();
14491455
let mut syscall_handler = test_ctx.new_syscall_handler();
1456+
let mut syscall_handler = &mut syscall_handler;
14501457
let mut gas = 0;
14511458

14521459
let p = syscall_handler
@@ -1485,6 +1492,7 @@ mod test {
14851492
fn secp256r1_mul() {
14861493
let mut test_ctx = TestContext::default();
14871494
let mut syscall_handler = test_ctx.new_syscall_handler();
1495+
let mut syscall_handler = &mut syscall_handler;
14881496
let mut gas = 0;
14891497

14901498
let p = syscall_handler
@@ -1517,6 +1525,7 @@ mod test {
15171525
fn secp256r1_get_point_from_x() {
15181526
let mut test_ctx = TestContext::default();
15191527
let mut syscall_handler = test_ctx.new_syscall_handler();
1528+
let mut syscall_handler = &mut syscall_handler;
15201529
let mut gas = 0;
15211530

15221531
let p = syscall_handler
@@ -1540,6 +1549,7 @@ mod test {
15401549
fn secp256r1_get_xy() {
15411550
let mut test_ctx = TestContext::default();
15421551
let mut syscall_handler = test_ctx.new_syscall_handler();
1552+
let mut syscall_handler = &mut syscall_handler;
15431553
let mut gas = 0;
15441554

15451555
let (x, y) = syscall_handler

‎src/transaction/declare.rs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ mod tests {
613613
},
614614
transaction::{Address, ClassHash},
615615
};
616-
use cairo_lang_starknet::casm_contract_class::CasmContractClass;
616+
use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
617617
use cairo_vm::Felt252;
618618

619619
use std::{fs::File, io::BufReader, path::PathBuf, sync::Arc};
@@ -626,11 +626,11 @@ mod tests {
626626

627627
let file = File::open(path).unwrap();
628628
let reader = BufReader::new(file);
629-
let sierra_contract_class: cairo_lang_starknet::contract_class::ContractClass =
629+
let sierra_contract_class: cairo_lang_starknet_classes::contract_class::ContractClass =
630630
serde_json::from_reader(reader).unwrap();
631631
let sender_address = Address(1.into());
632632
let casm_class =
633-
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true).unwrap();
633+
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true, usize::MAX).unwrap();
634634
let casm_class_hash = compute_casm_class_hash(&casm_class).unwrap();
635635

636636
// create declare
@@ -660,6 +660,7 @@ mod tests {
660660
let expected_casm_class = CasmContractClass::from_contract_class(
661661
declare.sierra_contract_class.unwrap().clone(),
662662
true,
663+
usize::MAX
663664
)
664665
.unwrap();
665666
let declare_compiled_class_hash = ClassHash::from(declare.compiled_class_hash);
@@ -682,11 +683,11 @@ mod tests {
682683

683684
let file = File::open(path).unwrap();
684685
let reader = BufReader::new(file);
685-
let sierra_contract_class: cairo_lang_starknet::contract_class::ContractClass =
686+
let sierra_contract_class: cairo_lang_starknet_classes::contract_class::ContractClass =
686687
serde_json::from_reader(reader).unwrap();
687688
let sender_address = Address(1.into());
688689
let casm_class =
689-
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true).unwrap();
690+
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true, usize::MAX).unwrap();
690691
let casm_class_hash = compute_casm_class_hash(&casm_class).unwrap();
691692

692693
// create declare
@@ -714,7 +715,7 @@ mod tests {
714715

715716
// test we can retreive the data
716717
let expected_casm_class =
717-
CasmContractClass::from_contract_class(declare.sierra_contract_class.unwrap(), true)
718+
CasmContractClass::from_contract_class(declare.sierra_contract_class.unwrap(), true, usize::MAX)
718719
.unwrap();
719720
let declare_compiled_class_hash = ClassHash::from(declare.compiled_class_hash);
720721
let casm_class = match state
@@ -736,12 +737,12 @@ mod tests {
736737

737738
let file = File::open(path).unwrap();
738739
let reader = BufReader::new(file);
739-
let sierra_contract_class: cairo_lang_starknet::contract_class::ContractClass =
740+
let sierra_contract_class: cairo_lang_starknet_classes::contract_class::ContractClass =
740741
serde_json::from_reader(reader).unwrap();
741742
let sierra_class_hash = compute_sierra_class_hash(&sierra_contract_class).unwrap();
742743
let sender_address = Address(1.into());
743744
let casm_class =
744-
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true).unwrap();
745+
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true, usize::MAX).unwrap();
745746
let casm_class_hash = compute_casm_class_hash(&casm_class).unwrap();
746747

747748
// create declare tx
@@ -770,7 +771,7 @@ mod tests {
770771

771772
// test we can retreive the data
772773
let expected_casm_class =
773-
CasmContractClass::from_contract_class(declare.sierra_contract_class.unwrap(), true)
774+
CasmContractClass::from_contract_class(declare.sierra_contract_class.unwrap(), true, usize::MAX)
774775
.unwrap();
775776
let declare_compiled_class_hash = ClassHash::from(declare.compiled_class_hash);
776777
let casm_class = match state
@@ -792,11 +793,11 @@ mod tests {
792793

793794
let file = File::open(path).unwrap();
794795
let reader = BufReader::new(file);
795-
let sierra_contract_class: cairo_lang_starknet::contract_class::ContractClass =
796+
let sierra_contract_class: cairo_lang_starknet_classes::contract_class::ContractClass =
796797
serde_json::from_reader(reader).unwrap();
797798
let sender_address = Address(1.into());
798799
let casm_class =
799-
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true).unwrap();
800+
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true, usize::MAX).unwrap();
800801
let casm_class_hash = compute_casm_class_hash(&casm_class).unwrap();
801802

802803
// create declare tx
@@ -826,6 +827,7 @@ mod tests {
826827
let expected_casm_class = CasmContractClass::from_contract_class(
827828
declare.sierra_contract_class.unwrap().clone(),
828829
true,
830+
usize::MAX
829831
)
830832
.unwrap();
831833
let declare_compiled_class_hash = ClassHash::from(declare.compiled_class_hash);
@@ -848,11 +850,11 @@ mod tests {
848850

849851
let file = File::open(path).unwrap();
850852
let reader = BufReader::new(file);
851-
let sierra_contract_class: cairo_lang_starknet::contract_class::ContractClass =
853+
let sierra_contract_class: cairo_lang_starknet_classes::contract_class::ContractClass =
852854
serde_json::from_reader(reader).unwrap();
853855
let sender_address = Address(1.into());
854856
let casm_class =
855-
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true).unwrap();
857+
CasmContractClass::from_contract_class(sierra_contract_class.clone(), true, usize::MAX).unwrap();
856858
let casm_class_hash = compute_casm_class_hash(&casm_class).unwrap();
857859

858860
let sended_class_hash = Felt252::from(5);
@@ -894,7 +896,7 @@ mod tests {
894896
let path = PathBuf::from("starknet_programs/cairo2/fibonacci.sierra");
895897
let file = File::open(path).unwrap();
896898
let reader = BufReader::new(file);
897-
let sierra_contract_class: cairo_lang_starknet::contract_class::ContractClass =
899+
let sierra_contract_class: cairo_lang_starknet_classes::contract_class::ContractClass =
898900
serde_json::from_reader(reader).unwrap();
899901

900902
let chain_id = StarknetChainId::TestNet.to_felt();

‎src/transaction/invoke_function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ mod tests {
659659
transaction::ClassHash,
660660
utils::calculate_sn_keccak,
661661
};
662-
use cairo_lang_starknet::casm_contract_class::CasmContractClass;
662+
use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
663663

664664
use pretty_assertions_sorted::{assert_eq, assert_eq_sorted};
665665
use starknet_api::{

‎src/transaction/l1_handler.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ mod test {
270270
sync::Arc,
271271
};
272272

273-
use cairo_vm::{vm::runners::cairo_runner::ExecutionResources, Felt252};
273+
use cairo_vm::{types::builtin_name::BuiltinName, vm::runners::cairo_runner::ExecutionResources, Felt252};
274274

275275
/// Test the correct execution of the L1Handler.
276276
#[test]
@@ -363,8 +363,8 @@ mod test {
363363
n_steps: 141,
364364
n_memory_holes: 20,
365365
builtin_instance_counter: HashMap::from([
366-
("range_check_builtin".to_string(), 6),
367-
("pedersen_builtin".to_string(), 2),
366+
(BuiltinName::range_check, 6),
367+
(BuiltinName::pedersen, 2),
368368
]),
369369
}),
370370
events: vec![],

0 commit comments

Comments
 (0)