Skip to content

Commit

Permalink
Replace old dependency compilation with new pkg_graph approach
Browse files Browse the repository at this point in the history
This removes the old dependency-specific compilation logic in favour of
flattening the graph into a list of compilation steps and using the same
`compile_pkg` function to compile all packages, including at the
top-level package.
  • Loading branch information
mitchmindtree committed Feb 22, 2022
1 parent 621df94 commit 95a68b5
Show file tree
Hide file tree
Showing 6 changed files with 265 additions and 390 deletions.
4 changes: 2 additions & 2 deletions forc/src/ops/forc_abi_json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ pub fn build(command: JsonAbiCommand) -> Result<Value, String> {
minify_json_abi: command.minify,
..Default::default()
};
let (_bytes, json_abi) = crate::ops::forc_build::build(build_command)?;
let json_abi = json!(json_abi);
let compiled = crate::ops::forc_build::build(build_command)?;
let json_abi = json!(compiled.json_abi);
if let Some(outfile) = command.json_outfile {
let file = File::create(outfile).map_err(|e| e.to_string())?;
let res = if command.minify {
Expand Down
Loading

0 comments on commit 95a68b5

Please sign in to comment.