moved snos import to tests or binary

keep-starknet-strange · Oct 15, 2024 · 198b6a4 · 198b6a4
1 parent b60b2cb
commit 198b6a4
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 5 deletions.
diff --git a/crates/bin/prove_block/src/lib.rs b/crates/bin/prove_block/src/lib.rs
@@ -45,6 +45,8 @@ mod state_utils;
 mod types;
 mod utils;
 
+pub const DEFAULT_COMPILED_OS: &[u8] = include_bytes!("../../../../build/os_latest.json");
+
 #[derive(Debug, Error)]
 pub enum ProveBlockError {
     #[error("RPC Error: {0}")]
@@ -324,7 +326,7 @@ pub async fn prove_block(
         (old_block_number, old_block_hash),
     );
 
-    Ok(run_os(config::DEFAULT_COMPILED_OS, layout, os_input, block_context, execution_helper)?)
+    Ok(run_os(DEFAULT_COMPILED_OS, layout, os_input, block_context, execution_helper)?)
 }
 
 pub fn debug_prove_error(err: ProveBlockError) -> ProveBlockError {

diff --git a/crates/starknet-os/src/config.rs b/crates/starknet-os/src/config.rs
@@ -23,8 +23,6 @@ pub const fn default_layout() -> LayoutName {
 // https://github.com/starkware-libs/blockifier/blob/8da582b285bfbc7d4c21178609bbd43f80a69240/crates/native_blockifier/src/py_block_executor.rs#L44
 const MAX_STEPS_PER_TX: u32 = 4_000_000;
 
-pub const DEFAULT_COMPILED_OS: &[u8] = include_bytes!("../../../build/os_latest.json");
-
 const DEFAULT_CONFIG_PATH: &str = "../../cairo-lang/src/starkware/starknet/definitions/general_config.yml";
 pub const STORED_BLOCK_HASH_BUFFER: u64 = 10;
 pub const BLOCK_HASH_CONTRACT_ADDRESS: u64 = 1;

diff --git a/tests/integration/common/mod.rs b/tests/integration/common/mod.rs
@@ -16,6 +16,8 @@ pub mod state;
 pub mod transaction_utils;
 pub mod utils;
 
+pub const DEFAULT_COMPILED_OS: &[u8] = include_bytes!("../../../build/os_latest.json");
+
 #[fixture]
 pub fn setup_runner() -> CairoRunner {
     let program_content = fs::read("../build/programs/fact.json").unwrap();

diff --git a/tests/integration/common/transaction_utils.rs b/tests/integration/common/transaction_utils.rs
@@ -884,6 +884,7 @@ where
 }
 
 pub async fn execute_txs_and_run_os<S>(
+    compiled_os: &[u8],
     state: CachedState<SharedState<S, PedersenHash>>,
     block_context: BlockContext,
     txs: Vec<Transaction>,
@@ -905,7 +906,7 @@ where
     .await;
 
     let layout = config::default_layout();
-    let result = run_os(config::DEFAULT_COMPILED_OS, layout, os_input, block_context, execution_helper);
+    let result = run_os(compiled_os, layout, os_input, block_context, execution_helper);
 
     match &result {
         Err(Runner(VmException(vme))) => {

diff --git a/tests/integration/declare_txn_tests.rs b/tests/integration/declare_txn_tests.rs
@@ -83,6 +83,7 @@ async fn declare_v3_cairo1_account(
 
     let txs = vec![declare_tx].into_iter().map(Into::into).collect();
     let _result = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,
@@ -149,6 +150,7 @@ async fn declare_cairo1_account(
 
     let txs = vec![declare_tx].into_iter().map(Into::into).collect();
     let _result = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,
@@ -207,6 +209,7 @@ async fn declare_v1_cairo0_account(
 
     let txs = vec![declare_tx].into_iter().map(Into::into).collect();
     let _result = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,

diff --git a/tests/integration/deploy_txn_tests.rs b/tests/integration/deploy_txn_tests.rs
@@ -102,6 +102,7 @@ async fn deploy_cairo0_account(
 
     let txs = vec![deploy_account_tx].into_iter().map(Into::into).collect();
     let _result = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,
@@ -194,6 +195,7 @@ async fn deploy_cairo1_account(
 
     let txs = vec![AccountTransaction::DeployAccount(deploy_account_tx)].into_iter().map(Into::into).collect();
     let _result = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,

diff --git a/tests/integration/deprecated_syscalls_tests.rs b/tests/integration/deprecated_syscalls_tests.rs
@@ -69,6 +69,7 @@ async fn test_syscall_library_call_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -110,6 +111,7 @@ async fn test_syscall_get_block_number_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -151,6 +153,7 @@ async fn test_syscall_get_block_timestamp_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -212,6 +215,7 @@ async fn test_syscall_get_tx_info_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -270,6 +274,7 @@ async fn test_syscall_get_tx_signature_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -315,6 +320,7 @@ async fn test_syscall_replace_class_cairo0(
 
     // TODO: use a different class hash and check that it is reflected in the OS output.
     let (_pie, _os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -374,6 +380,7 @@ async fn test_syscall_deploy_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -426,6 +433,7 @@ async fn test_syscall_get_sequencer_address_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -482,6 +490,7 @@ async fn test_syscall_get_contract_address_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -534,6 +543,7 @@ async fn test_syscall_emit_event_cairo0(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, _os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -581,6 +591,7 @@ async fn test_syscall_send_message_to_l1_cairo0(
 
     let txs = vec![Transaction::AccountTransaction(tx)];
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,

diff --git a/tests/integration/kzg_da_tests.rs b/tests/integration/kzg_da_tests.rs
@@ -32,6 +32,7 @@ async fn test_kzg_da_cairo_1(#[future] initial_state_cairo1: StarknetTestState,
     };
     let txs = vec![l1_tx].into_iter().map(Into::into).collect();
     let (_, output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         BlockContext::create_for_account_testing_with_kzg(true),
         txs,
@@ -64,6 +65,7 @@ async fn test_kzg_da_cairo_0(#[future] initial_state_cairo0: StarknetTestState,
     };
     let txs = vec![l1_tx].into_iter().map(Into::into).collect();
     let (_, output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         BlockContext::create_for_account_testing_with_kzg(true),
         txs,

diff --git a/tests/integration/l1_handler_txn_tests.rs b/tests/integration/l1_handler_txn_tests.rs
@@ -62,7 +62,7 @@ async fn l1_handler<F>(
         tx_hash: Default::default(),
     };
     let txs = vec![l1_tx].into_iter().map(Into::into).collect();
-    let _result = execute_txs_and_run_os(
+    let _result = execute_txs_and_run_os(crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,

diff --git a/tests/integration/os.rs b/tests/integration/os.rs
@@ -45,6 +45,7 @@ async fn return_result_cairo0_account(
 
     let txs = vec![return_result_tx].into_iter().map(Into::into).collect();
     let _result = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,
@@ -86,6 +87,7 @@ async fn return_result_cairo1_account(
 
     let txs = vec![return_result_tx].into_iter().map(Into::into).collect();
     let _result = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,
@@ -196,6 +198,7 @@ async fn syscalls_cairo1(
     .collect();
 
     let _result = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,

diff --git a/tests/integration/run_os.rs b/tests/integration/run_os.rs
@@ -609,6 +609,7 @@ async fn run_os_tests(#[future] initial_state_full_itests: StarknetTestState) {
     let cached_state = CachedState::from(shared_state);
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         cached_state,
         block_context,
         txs,

diff --git a/tests/integration/segments_tests.rs b/tests/integration/segments_tests.rs
@@ -43,6 +43,7 @@ async fn test_segment_arena(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, _os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context,
         txs,

diff --git a/tests/integration/syscalls_tests.rs b/tests/integration/syscalls_tests.rs
@@ -56,6 +56,7 @@ async fn test_syscall_library_call_cairo1(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -99,6 +100,7 @@ async fn test_syscall_replace_class_cairo1(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, _os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -138,6 +140,7 @@ async fn test_syscall_keccak_cairo1(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, _os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,
@@ -180,6 +183,7 @@ async fn test_syscall_test_secp_cairo1(
     let txs = vec![Transaction::AccountTransaction(tx)];
 
     let (_pie, os_output) = execute_txs_and_run_os(
+        crate::common::DEFAULT_COMPILED_OS,
         initial_state.cached_state,
         block_context.clone(),
         txs,