fix(revert): "feat(avm): storage" (#5019)

Reverts AztecProtocol/aztec-packages#4673 due to an uncaught issue with end-to-end tests
superstar0402 · Mar 19, 2024 · 3be81ab · 3be81ab
1 parent de11d65
commit 3be81ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/aztec/src/context.nr b/aztec/src/context.nr
@@ -14,23 +14,18 @@ use avm::AVMContext;
 struct Context {
     private: Option<&mut PrivateContext>,
     public: Option<&mut PublicContext>,
-    public_vm: Option<&mut AVMContext>,
 }
 
 impl Context {
     pub fn private(context: &mut PrivateContext) -> Context {
-        Context { private: Option::some(context), public: Option::none(), public_vm: Option::none() }
+        Context { private: Option::some(context), public: Option::none() }
     }
 
     pub fn public(context: &mut PublicContext) -> Context {
-        Context { public: Option::some(context), private: Option::none(), public_vm: Option::none() }
-    }
-
-    pub fn public_vm(context: &mut AVMContext) -> Context {
-        Context { public_vm: Option::some(context), public: Option::none(), private: Option::none() }
+        Context { public: Option::some(context), private: Option::none() }
     }
 
     pub fn none() -> Context {
-        Context { public: Option::none(), private: Option::none(), public_vm: Option::none() }
+        Context { public: Option::none(), private: Option::none() }
     }
 }
diff --git a/aztec/src/oracle/storage.nr b/aztec/src/oracle/storage.nr
@@ -12,8 +12,8 @@ pub fn storage_read<N>(storage_slot: Field) -> [Field; N] {
 }
 
 #[oracle(storageWrite)]
-fn storage_write_oracle<N>(_storage_slot: Field, _values: [Field; N]) -> Field {}
+fn storage_write_oracle<N>(_storage_slot: Field, _values: [Field; N]) -> [Field; N] {}
 
 unconstrained pub fn storage_write<N>(storage_slot: Field, fields: [Field; N]) {
-    let _ = storage_write_oracle(storage_slot, fields);
+    let _hash = storage_write_oracle(storage_slot, fields);
 }