Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(blockifier): revert- sierra_compilation_config compile only w feature cairo_native #3887

Merged
merged 1 commit into from
Feb 3, 2025
Merged

chore(blockifier): revert- sierra_compilation_config compile only w feature cairo_native #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/blockifier/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ sha2.workspace = true
starknet-types-core.workspace = true
starknet_api.workspace = true
starknet_infra_utils.workspace = true
starknet_sierra_multicompile = { workspace = true, optional = true }
starknet_sierra_multicompile.workspace = true
strum.workspace = true
strum_macros.workspace = true
tempfile.workspace = true
Expand Down
4 changes: 0 additions & 4 deletions crates/blockifier/src/blockifier/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use std::collections::BTreeMap;
use papyrus_config::dumping::{append_sub_config_name, ser_param, SerializeConfig};
use papyrus_config::{ParamPath, ParamPrivacyInput, SerializedParam};
use serde::{Deserialize, Serialize};
#[cfg(feature = "cairo_native")]
use starknet_sierra_multicompile::config::SierraCompilationConfig;

#[cfg(any(test, feature = "testing", feature = "native_blockifier"))]
Expand Down Expand Up @@ -84,7 +83,6 @@ impl SerializeConfig for ConcurrencyConfig {
pub struct ContractClassManagerConfig {
pub cairo_native_run_config: CairoNativeRunConfig,
pub contract_cache_size: usize,
#[cfg(feature = "cairo_native")]
pub native_compiler_config: SierraCompilationConfig,
}

Expand All @@ -93,7 +91,6 @@ impl Default for ContractClassManagerConfig {
Self {
cairo_native_run_config: CairoNativeRunConfig::default(),
contract_cache_size: GLOBAL_CONTRACT_CACHE_SIZE_FOR_TEST,
#[cfg(feature = "cairo_native")]
native_compiler_config: SierraCompilationConfig::default(),
}
}
Expand Down Expand Up @@ -123,7 +120,6 @@ impl SerializeConfig for ContractClassManagerConfig {
self.cairo_native_run_config.dump(),
"cairo_native_run_config",
));
#[cfg(feature = "cairo_native")]
dump.append(&mut append_sub_config_name(
self.native_compiler_config.dump(),
"native_compiler_config",
Expand Down
1 change: 0 additions & 1 deletion crates/native_blockifier/src/py_objects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ impl From<PyContractClassManagerConfig> for ContractClassManagerConfig {
cairo_native_run_config: py_contract_class_manager_config
.cairo_native_run_config
.into(),
#[cfg(feature = "cairo_native")]
native_compiler_config: py_contract_class_manager_config.native_compiler_config.into(),
}
}
Expand Down
1 change: 0 additions & 1 deletion crates/starknet_sequencer_node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ repository.workspace = true
license.workspace = true

[features]
cairo_native = []
testing = ["papyrus_proc_macros"]

[lints]
Expand Down
13 changes: 1 addition & 12 deletions crates/starknet_sequencer_node/src/config/config_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,14 @@ fn test_valid_component_execution_config(
assert_eq!(component_exe_config.validate(), Ok(()));
}

#[cfg(not(feature = "cairo_native"))]
fn remove_native_config(json: &mut serde_json::Value) {
if let Some(obj) = json.as_object_mut() {
// Remove fields related to Sierra compilation, used only when "cairo_native" feature is
// enabled.
obj.retain(|key, _| !key.contains("native_compiler_config."));
}
}

/// Test the validation of the struct SequencerNodeConfig and that the default config file is up to
/// date. To update the default config file, run:
/// cargo run --bin sequencer_dump_config -q
#[test]
fn test_default_config_file_is_up_to_date() {
env::set_current_dir(resolve_project_relative_path("").unwrap())
.expect("Couldn't set working dir.");
let mut from_default_config_file: serde_json::Value =
let from_default_config_file: serde_json::Value =
serde_json::from_reader(File::open(DEFAULT_CONFIG_PATH).unwrap()).unwrap();

let default_config = SequencerNodeConfig::default();
Expand All @@ -104,8 +95,6 @@ fn test_default_config_file_is_up_to_date() {
// Read the dumped config from the file.
let from_code: serde_json::Value =
serde_json::from_reader(File::open(tmp_file_path).unwrap()).unwrap();
#[cfg(not(feature = "cairo_native"))]
remove_native_config(&mut from_default_config_file);

println!(
"{}",
Expand Down
Loading