Skip to content

Commit

Permalink
renaming to zk_***
Browse files Browse the repository at this point in the history
zk_detect_missing_libraries since we have this naming convention
  • Loading branch information
MBerguer committed Jan 6, 2025
1 parent 777e47b commit a3ff547
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions crates/config/src/zksync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ pub struct ZkSyncConfig {
pub force_evmla: bool,

pub llvm_options: Vec<String>,

/// Detect missing libraries, instead of erroring
pub detect_missing_libraries: bool,
pub zk_detect_missing_libraries: bool,

/// Enable optimizer for zkSync
pub optimizer: bool,
Expand Down Expand Up @@ -77,7 +77,7 @@ impl Default for ZkSyncConfig {
fallback_oz: Default::default(),
enable_eravm_extensions: Default::default(),
force_evmla: Default::default(),
detect_missing_libraries: Default::default(),
zk_detect_missing_libraries: Default::default(),
llvm_options: Default::default(),
optimizer: true,
optimizer_mode: '3',
Expand Down Expand Up @@ -123,7 +123,7 @@ impl ZkSyncConfig {
via_ir: Some(via_ir),
// Set in project paths.
remappings: Vec::new(),
detect_missing_libraries: self.detect_missing_libraries,
zk_detect_missing_libraries: self.zk_detect_missing_libraries,

Check failure on line 126 in crates/config/src/zksync.rs

View workflow job for this annotation

GitHub Actions / zk-cargo-test

struct `ZkSettings` has no field named `zk_detect_missing_libraries`
enable_eravm_extensions: self.enable_eravm_extensions,
force_evmla: self.force_evmla,
llvm_options: self.llvm_options.clone(),
Expand Down
6 changes: 3 additions & 3 deletions crates/forge/bin/cmd/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pub struct BuildArgs {

/// Detect missing libraries, instead of erroring
#[clap(long = "zk-detect-missing-libraries", group = "build")]
pub detect_missing_libraries: bool,
pub zk_detect_missing_libraries: bool,

#[command(flatten)]
#[serde(flatten)]
Expand Down Expand Up @@ -213,8 +213,8 @@ impl Provider for BuildArgs {
dict.insert("ignore_eip_3860".to_string(), true.into());
}

if self.detect_missing_libraries {
dict.insert("detect_missing_libraries".to_string(), true.into());
if self.zk_detect_missing_libraries {
dict.insert("zk_detect_missing_libraries".to_string(), true.into());
}

Ok(Map::from([(Config::selected_profile(), dict)]))
Expand Down
2 changes: 1 addition & 1 deletion crates/forge/tests/cli/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ forgetest_init!(test_zk_build_missing_libraries_as_arg, |prj, cmd| {
});

forgetest_init!(test_zk_build_missing_libraries_as_config, |prj, cmd| {
let zk = ZkSyncConfig { detect_missing_libraries: true, ..Default::default() };
let zk = ZkSyncConfig { zk_detect_missing_libraries: true, ..Default::default() };
prj.write_config(Config { zksync: zk, ..Default::default() });
cmd.args(["build", "--zksync", "--zk-detect-missing-libraries"]).assert_success();
});
Expand Down

0 comments on commit a3ff547

Please sign in to comment.