Skip to content

Commit

Permalink
chore: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dutterbutter committed Nov 6, 2024
1 parent 6e87603 commit 86d414d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion crates/forge/bin/cmd/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ impl BuildArgs {
.bail(!format_json);

let zk_output = zk_compiler.zksync_compile(&zk_project)?;
if self.format_json {
if format_json {
println!("{}", serde_json::to_string_pretty(&zk_output.output())?);
}

Expand Down
4 changes: 1 addition & 3 deletions crates/forge/bin/cmd/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,7 @@ impl CreateArgs {
let config = self.opts.try_load_config_emit_warnings()?;
let zk_project =
foundry_zksync_compiler::config_create_project(&config, config.cache, false)?;
let zk_compiler = ProjectCompiler::new()
.quiet(self.json || self.opts.silent)
.files([target_path.clone()]);
let zk_compiler = ProjectCompiler::new().files([target_path.clone()]);
let mut zk_output = zk_compiler.zksync_compile(&zk_project)?;

let artifact = remove_zk_contract(&mut zk_output, &target_path, &self.contract.name)?;
Expand Down

0 comments on commit 86d414d

Please sign in to comment.