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

Commit 794ac25

Browse files
MegaRedHandMegaRedHand
committed
Remove ParsedContractClass 
1 parent e41627d commit 794ac25

25 files changed

+208
-497
lines changed

‎src/core/contract_address/deprecated_contract_address.rs‎

Lines changed: 11 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::{
1+
use crate::services::api::contract_classes::deprecated_contract_class::{
22
ContractEntryPoint, EntryPointType,
33
};
44
/// Contains functionality for computing class hashes for deprecated Declare transactions
@@ -351,26 +351,18 @@ pub fn compute_deprecated_class_hash(
351351

352352
#[cfg(test)]
353353
mod tests {
354-
use std::{fs, str::FromStr};
355-
356354
use super::*;
357-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::ParsedContractClass;
358355
use cairo_vm::felt::{felt_str, Felt252};
359356
use coverage_helper::test;
360357
use num_traits::Num;
361358

362359
#[test]
363360
fn test_compute_hinted_class_hash_with_abi() {
364-
let contract_str =
365-
fs::read_to_string("starknet_programs/raw_contract_classes/class_with_abi.json")
366-
.unwrap();
367-
let parsed_contract_class = ParsedContractClass::try_from(contract_str.as_str()).unwrap();
368-
let contract_class = ContractClass {
369-
program_json: serde_json::Value::from_str(&contract_str).unwrap(),
370-
program: parsed_contract_class.program,
371-
entry_points_by_type: parsed_contract_class.entry_points_by_type,
372-
abi: parsed_contract_class.abi,
373-
};
361+
let contract_class = ContractClass::new_from_path(
362+
"starknet_programs/raw_contract_classes/class_with_abi.json",
363+
)
364+
.unwrap();
365+
374366
assert_eq!(
375367
compute_hinted_class_hash(&contract_class).unwrap(),
376368
Felt252::from_str_radix(
@@ -383,14 +375,7 @@ mod tests {
383375

384376
#[test]
385377
fn test_compute_class_hash_1354433237b0039baa138bf95b98fe4a8ae3df7ac4fd4d4845f0b41cd11bec4() {
386-
let contract_str = fs::read_to_string("starknet_programs/raw_contract_classes/0x1354433237b0039baa138bf95b98fe4a8ae3df7ac4fd4d4845f0b41cd11bec4.json").unwrap();
387-
let parsed_contract_class = ParsedContractClass::try_from(contract_str.as_str()).unwrap();
388-
let contract_class = ContractClass {
389-
program_json: serde_json::Value::from_str(&contract_str).unwrap(),
390-
program: parsed_contract_class.program,
391-
entry_points_by_type: parsed_contract_class.entry_points_by_type,
392-
abi: parsed_contract_class.abi,
393-
};
378+
let contract_class = ContractClass::new_from_path("starknet_programs/raw_contract_classes/0x1354433237b0039baa138bf95b98fe4a8ae3df7ac4fd4d4845f0b41cd11bec4.json").unwrap();
394379

395380
assert_eq!(
396381
compute_deprecated_class_hash(&contract_class).unwrap(),
@@ -405,14 +390,7 @@ mod tests {
405390
#[test]
406391
fn test_compute_class_hash_0x03131fa018d520a037686ce3efddeab8f28895662f019ca3ca18a626650f7d1e()
407392
{
408-
let contract_str = fs::read_to_string("starknet_programs/raw_contract_classes/0x03131fa018d520a037686ce3efddeab8f28895662f019ca3ca18a626650f7d1e.json").unwrap();
409-
let parsed_contract_class = ParsedContractClass::try_from(contract_str.as_str()).unwrap();
410-
let contract_class = ContractClass {
411-
program_json: serde_json::Value::from_str(&contract_str).unwrap(),
412-
program: parsed_contract_class.program,
413-
entry_points_by_type: parsed_contract_class.entry_points_by_type,
414-
abi: parsed_contract_class.abi,
415-
};
393+
let contract_class = ContractClass::new_from_path("starknet_programs/raw_contract_classes/0x03131fa018d520a037686ce3efddeab8f28895662f019ca3ca18a626650f7d1e.json").unwrap();
416394

417395
assert_eq!(
418396
compute_deprecated_class_hash(&contract_class).unwrap(),
@@ -427,14 +405,7 @@ mod tests {
427405
#[test]
428406
fn test_compute_class_hash_0x025ec026985a3bf9d0cc1fe17326b245dfdc3ff89b8fde106542a3ea56c5a918()
429407
{
430-
let contract_str = fs::read_to_string("starknet_programs/raw_contract_classes/0x025ec026985a3bf9d0cc1fe17326b245dfdc3ff89b8fde106542a3ea56c5a918.json").unwrap();
431-
let parsed_contract_class = ParsedContractClass::try_from(contract_str.as_str()).unwrap();
432-
let contract_class = ContractClass {
433-
program_json: serde_json::Value::from_str(&contract_str).unwrap(),
434-
program: parsed_contract_class.program,
435-
entry_points_by_type: parsed_contract_class.entry_points_by_type,
436-
abi: parsed_contract_class.abi,
437-
};
408+
let contract_class = ContractClass::new_from_path("starknet_programs/raw_contract_classes/0x025ec026985a3bf9d0cc1fe17326b245dfdc3ff89b8fde106542a3ea56c5a918.json").unwrap();
438409

439410
assert_eq!(
440411
compute_deprecated_class_hash(&contract_class).unwrap(),
@@ -449,14 +420,7 @@ mod tests {
449420
#[test]
450421
fn test_compute_class_hash_0x02c3348ad109f7f3967df6494b3c48741d61675d9a7915b265aa7101a631dc33()
451422
{
452-
let contract_str = fs::read_to_string("starknet_programs/raw_contract_classes/0x02c3348ad109f7f3967df6494b3c48741d61675d9a7915b265aa7101a631dc33.json").unwrap();
453-
let parsed_contract_class = ParsedContractClass::try_from(contract_str.as_str()).unwrap();
454-
let contract_class = ContractClass {
455-
program_json: serde_json::Value::from_str(&contract_str).unwrap(),
456-
program: parsed_contract_class.program,
457-
entry_points_by_type: parsed_contract_class.entry_points_by_type,
458-
abi: parsed_contract_class.abi,
459-
};
423+
let contract_class = ContractClass::new_from_path("starknet_programs/raw_contract_classes/0x02c3348ad109f7f3967df6494b3c48741d61675d9a7915b265aa7101a631dc33.json").unwrap();
460424

461425
assert_eq!(
462426
compute_deprecated_class_hash(&contract_class).unwrap(),
@@ -473,14 +437,7 @@ mod tests {
473437
#[test]
474438
fn test_compute_class_hash_0x00801ad5dc7c995addf7fbce1c4c74413586acb44f9ff44ba903a08a6153fa80()
475439
{
476-
let contract_str = fs::read_to_string("starknet_programs/raw_contract_classes/0x00801ad5dc7c995addf7fbce1c4c74413586acb44f9ff44ba903a08a6153fa80.json").unwrap();
477-
let parsed_contract_class = ParsedContractClass::try_from(contract_str.as_str()).unwrap();
478-
let contract_class = ContractClass {
479-
program_json: serde_json::Value::from_str(&contract_str).unwrap(),
480-
program: parsed_contract_class.program,
481-
entry_points_by_type: parsed_contract_class.entry_points_by_type,
482-
abi: parsed_contract_class.abi,
483-
};
440+
let contract_class = ContractClass::new_from_path("starknet_programs/raw_contract_classes/0x00801ad5dc7c995addf7fbce1c4c74413586acb44f9ff44ba903a08a6153fa80.json").unwrap();
484441

485442
assert_eq!(
486443
compute_deprecated_class_hash(&contract_class).unwrap(),

‎src/core/contract_address/sierra_contract_address.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::core::errors::contract_address_errors::ContractAddressError;
2-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::{
2+
use crate::services::api::contract_classes::deprecated_contract_class::{
33
ContractEntryPoint, EntryPointType,
44
};
55
use cairo_lang_starknet::{

‎src/execution/execution_entry_point.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::{
1+
use crate::services::api::contract_classes::deprecated_contract_class::{
22
ContractEntryPoint, EntryPointType,
33
};
44
use crate::{

‎src/execution/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pub mod execution_entry_point;
22
pub mod gas_usage;
33
pub mod os_usage;
44

5-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::EntryPointType;
5+
use crate::services::api::contract_classes::deprecated_contract_class::EntryPointType;
66
use crate::{
77
definitions::{
88
block_context::StarknetChainId, constants::CONSTRUCTOR_ENTRY_POINT_SELECTOR,

‎src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use utils::Address;
2525
extern crate assert_matches;
2626

2727
// Re-exports
28-
pub use crate::services::api::contract_classes::deprecated_parsed_contract_class::{
28+
pub use crate::services::api::contract_classes::deprecated_contract_class::{
2929
ContractEntryPoint, EntryPointType,
3030
};
3131
pub use cairo_lang_starknet::casm_contract_class::CasmContractClass;
@@ -207,7 +207,7 @@ mod test {
207207
use crate::estimate_message_fee;
208208
use crate::hash_utils::calculate_contract_address;
209209
use crate::services::api::contract_classes::deprecated_contract_class::ContractClass;
210-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::EntryPointType;
210+
use crate::services::api::contract_classes::deprecated_contract_class::EntryPointType;
211211
use crate::state::state_api::State;
212212
use crate::testing::{
213213
create_account_tx_test_state, TEST_ACCOUNT_CONTRACT_ADDRESS, TEST_CONTRACT_ADDRESS,

‎src/parser_errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::EntryPointType;
1+
use crate::services::api::contract_classes::deprecated_contract_class::EntryPointType;
22
use crate::{
33
core::errors::{contract_address_errors::ContractAddressError, state_errors::StateError},
44
syscalls::syscall_handler_errors::SyscallHandlerError,

‎src/serde_structs/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::EntryPointType;
1+
use crate::services::api::contract_classes::deprecated_contract_class::EntryPointType;
22
use serde::Deserialize;
33
use serde_json::Value;
44
use std::{collections::HashMap, fs::File, path::PathBuf};

‎src/services/api/contract_class_errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::services::api::contract_classes::deprecated_parsed_contract_class::ContractEntryPoint;
1+
use crate::services::api::contract_classes::deprecated_contract_class::ContractEntryPoint;
22
use thiserror::Error;
33

44
#[derive(Debug, PartialEq, Eq, Error)]

0 commit comments

Comments
 (0)