From e1309f35148693ed651c5c44b07eb147de4bd1a9 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:57:14 +0000 Subject: [PATCH 1/2] chore: fix dirty merge --- .../src/contracts/pending_commitments_contract/src/main.nr | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/src/main.nr b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/src/main.nr index 42b761b6384..3adaa0ff3a1 100644 --- a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/src/main.nr +++ b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/src/main.nr @@ -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() } From 4d7c98d6eda53d2dca6f14f9bcd69c397884e856 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:21:09 +0000 Subject: [PATCH 2/2] fix: update noir compiler snapshot --- .../noir-compiler/src/__snapshots__/index.test.ts.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/noir-compiler/src/__snapshots__/index.test.ts.snap b/yarn-project/noir-compiler/src/__snapshots__/index.test.ts.snap index a94c69debbb..b1c493ce78f 100644 --- a/yarn-project/noir-compiler/src/__snapshots__/index.test.ts.snap +++ b/yarn-project/noir-compiler/src/__snapshots__/index.test.ts.snap @@ -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; @@ -101,7 +101,7 @@ impl TestContractContractInterface { fn openFunction( self, - context: &mut Context + context: &mut PrivateContext ) { let mut serialised_args = [0; 0];