chore: add execution environment to merged tests

AztecProtocol · Jan 23, 2024 · 7fcc6cf · 7fcc6cf
1 parent 38dd382
commit 7fcc6cf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/bitwise.test.ts b/yarn-project/acir-simulator/src/avm/opcodes/bitwise.test.ts
@@ -12,13 +12,14 @@ import {
   Shr,
   Xor,
 } from './bitwise.js';
+import { initExecutionEnvironment } from '../fixtures/index.js';
 
 describe('Bitwise instructions', () => {
   let machineState: AvmMachineState;
   let stateManager = mock<AvmStateManager>();
 
   beforeEach(() => {
-    machineState = new AvmMachineState([]);
+    machineState = new AvmMachineState([], initExecutionEnvironment());
     stateManager = mock<AvmStateManager>();
   });
 

diff --git a/yarn-project/acir-simulator/src/avm/opcodes/instruction_set.ts b/yarn-project/acir-simulator/src/avm/opcodes/instruction_set.ts
@@ -1,6 +1,7 @@
 import { Add, Div, Mul, Sub } from './arithmetic.js';
 import { And, Not, Or, Shl, Shr, Xor } from './bitwise.js';
 //import { Eq, Lt, Lte } from './comparators.js';
+import {SLoad, SStore} from './storage.js';
 import { InternalCall, InternalReturn, Jump, JumpI, Return } from './control_flow.js';
 import { Instruction } from './instruction.js';
 import { CMov, CalldataCopy, Cast, Mov, Set } from './memory.js';
@@ -75,8 +76,8 @@ export const INSTRUCTION_SET: Map<Opcode, InstructionConstructorAndMembers> = ne
 
     //// World State
     //[Opcode.BLOCKHEADERBYNUMBER, Blockheaderbynumber],
-    //[Opcode.SLOAD, Sload], // Public Storage
-    //[Opcode.SSTORE, Sstore], // Public Storage
+    [Opcode.SLOAD, SLoad], // Public Storage
+    [Opcode.SSTORE, SStore], // Public Storage
     //[Opcode.READL1TOL2MSG, Readl1tol2msg], // Messages
     //[Opcode.SENDL2TOL1MSG, Sendl2tol1msg], // Messages
     //[Opcode.EMITNOTEHASH, Emitnotehash], // Notes & Nullifiers

diff --git a/yarn-project/acir-simulator/src/avm/opcodes/memory.test.ts b/yarn-project/acir-simulator/src/avm/opcodes/memory.test.ts
@@ -5,13 +5,14 @@ import { mock } from 'jest-mock-extended';
 import { AvmMachineState } from '../avm_machine_state.js';
 import { AvmStateManager } from '../avm_state_manager.js';
 import { CMov, CalldataCopy, Cast, Mov, Set } from './memory.js';
+import { initExecutionEnvironment } from '../fixtures/index.js';
 
 describe('Memory instructions', () => {
   let machineState: AvmMachineState;
   let stateManager = mock<AvmStateManager>();
 
   beforeEach(() => {
-    machineState = new AvmMachineState([]);
+    machineState = new AvmMachineState([], initExecutionEnvironment());
     stateManager = mock<AvmStateManager>();
   });
 
@@ -141,7 +142,7 @@ describe('Memory instructions', () => {
       const previousValue = new Fr(123456n);
       const calldata = [new Fr(1n), new Fr(2n), new Fr(3n)];
 
-      machineState = new AvmMachineState(calldata);
+      machineState = new AvmMachineState(calldata, initExecutionEnvironment());
       machineState.writeMemory(0, previousValue);
 
       new CalldataCopy(/*cdOffset=*/ 2, /*copySize=*/ 0, /*dstOffset=*/ 0).execute(machineState, stateManager);
@@ -154,7 +155,7 @@ describe('Memory instructions', () => {
       const previousValue = new Fr(123456n);
       const calldata = [new Fr(1n), new Fr(2n), new Fr(3n)];
 
-      machineState = new AvmMachineState(calldata);
+      machineState = new AvmMachineState(calldata, initExecutionEnvironment());
       machineState.writeMemory(0, previousValue);
 
       new CalldataCopy(/*cdOffset=*/ 0, /*copySize=*/ 3, /*dstOffset=*/ 0).execute(machineState, stateManager);
@@ -167,7 +168,7 @@ describe('Memory instructions', () => {
       const previousValue = new Fr(123456n);
       const calldata = [new Fr(1n), new Fr(2n), new Fr(3n)];
 
-      machineState = new AvmMachineState(calldata);
+      machineState = new AvmMachineState(calldata, initExecutionEnvironment());
       machineState.writeMemory(0, previousValue);
 
       new CalldataCopy(/*cdOffset=*/ 1, /*copySize=*/ 2, /*dstOffset=*/ 0).execute(machineState, stateManager);