chore: fix dirty merge (#1574)

fixes dirty merge between #1570 and #1515
AztecProtocol · Aug 15, 2023 · 58dc9bf · 58dc9bf
1 parent 86afbb3
commit 58dc9bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 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
@@ -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];
 

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
@@ -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()
     }