Skip to content

Commit b1e2487

Browse files
authored
Removed include_ on test files - using load instead. (#1632)
1 parent 49fbdc9 commit b1e2487

4 files changed

Lines changed: 13 additions & 36 deletions

File tree

src/executor.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,10 @@ fn parse_result(
718718
mod tests {
719719
use super::*;
720720
use crate::{
721-
context::NativeContext, include_contract, starknet_stub::StubSyscallHandler,
722-
utils::testing::load_program, OptLevel,
721+
context::NativeContext,
722+
starknet_stub::StubSyscallHandler,
723+
utils::testing::{load_contract, load_program},
724+
OptLevel,
723725
};
724726
use cairo_lang_sierra::program::Program;
725727
use rstest::*;
@@ -732,7 +734,7 @@ mod tests {
732734

733735
#[fixture]
734736
fn starknet_program() -> Program {
735-
include_contract!("contracts/simple_storage_42.contract.json")
737+
load_contract("contracts/simple_storage_42.contract.json")
736738
.extract_sierra_program(true)
737739
.unwrap()
738740
.program

src/executor/aot.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,9 @@ impl AotNativeExecutor {
183183
mod tests {
184184
use super::*;
185185
use crate::{
186-
context::NativeContext, include_contract, starknet_stub::StubSyscallHandler,
187-
utils::testing::load_program,
186+
context::NativeContext,
187+
starknet_stub::StubSyscallHandler,
188+
utils::testing::{load_contract, load_program},
188189
};
189190
use cairo_lang_sierra::program::Program;
190191
use rstest::*;
@@ -196,7 +197,7 @@ mod tests {
196197

197198
#[fixture]
198199
fn starknet_program() -> Program {
199-
include_contract!("contracts/simple_storage_42.contract.json")
200+
load_contract("contracts/simple_storage_42.contract.json")
200201
.extract_sierra_program(true)
201202
.unwrap()
202203
.program

src/executor/contract.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -801,8 +801,7 @@ impl Drop for LockFile {
801801
#[cfg(test)]
802802
mod tests {
803803
use super::*;
804-
use crate::include_contract;
805-
use crate::starknet_stub::StubSyscallHandler;
804+
use crate::{starknet_stub::StubSyscallHandler, utils::testing::load_contract};
806805
use cairo_lang_starknet_classes::contract_class::ContractClass;
807806
use rayon::iter::ParallelBridge;
808807
use rstest::*;
@@ -811,17 +810,17 @@ mod tests {
811810

812811
#[fixture]
813812
fn starknet_program() -> ContractClass {
814-
include_contract!("contracts/simple_storage_dup.contract.json")
813+
load_contract("contracts/simple_storage_dup.contract.json")
815814
}
816815

817816
#[fixture]
818817
fn starknet_program_factorial() -> ContractClass {
819-
include_contract!("contracts/simple_storage_factorial.contract.json")
818+
load_contract("contracts/simple_storage_factorial.contract.json")
820819
}
821820

822821
#[fixture]
823822
fn starknet_program_empty() -> ContractClass {
824-
include_contract!("contracts/simple_storage_empty.contract.json")
823+
load_contract("contracts/simple_storage_empty.contract.json")
825824
}
826825

827826
#[rstest]

src/utils/testing.rs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -335,31 +335,6 @@ pub fn get_compiled_program(name: &str) -> (String, Program) {
335335
(entrypoint, program)
336336
}
337337

338-
#[macro_export]
339-
macro_rules! include_program {
340-
( $path:expr ) => {
341-
serde_json::from_str::<cairo_lang_sierra::program::VersionedProgram>(include_str!(concat!(
342-
env!("CARGO_MANIFEST_DIR"),
343-
"/",
344-
$path
345-
)))
346-
.unwrap()
347-
};
348-
}
349-
#[macro_export]
350-
macro_rules! include_contract {
351-
( $path:expr ) => {
352-
serde_json::from_str::<cairo_lang_starknet_classes::contract_class::ContractClass>(
353-
include_str!(concat!(
354-
env!("CARGO_MANIFEST_DIR"),
355-
"/test_data_artifacts/",
356-
$path
357-
)),
358-
)
359-
.unwrap()
360-
};
361-
}
362-
363338
pub fn load_contract(path: &str) -> ContractClass {
364339
serde_json::from_str::<ContractClass>(
365340
&fs::read_to_string(format!(

0 commit comments

Comments
 (0)