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: fix dirty merge #1574

Merged
merged 2 commits into from
Aug 15, 2023
Merged

chore: fix dirty merge #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1309f3
chore: fix dirty merge
Maddiaa0 Aug 15, 2023
4d7c98d
fix: update noir compiler snapshot
Maddiaa0 Aug 15, 2023
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
4 changes: 2 additions & 2 deletions yarn-project/noir-compiler/src/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ exports[`noir-compiler using noir wasm generates noir external interface 1`] = `
"/* Autogenerated file, do not edit! */

use dep::std;
use dep::aztec::context::Context;
use dep::aztec::context::PrivateContext;
use dep::aztec::constants_gen::RETURN_VALUES_LENGTH;


Expand All @@ -101,7 +101,7 @@ impl TestContractContractInterface {

fn openFunction(
self,
context: &mut Context
context: &mut PrivateContext
) {
let mut serialised_args = [0; 0];

Expand Down
3 changes: 1 addition & 2 deletions yarn-project/noir-contracts/src/contracts/pending_commitments_contract/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ contract PendingCommitments {
amount: Field,
owner: Field,
) -> distinct pub abi::PrivateCircuitPublicInputs {
let storage = Storage::init();
let mut context = Context::new(inputs, abi::hash_args([amount, owner]));
let mut context = PrivateContext::new(inputs, abi::hash_args([amount, owner]));
context.finish()
}

Expand Down