chore(avm): nit fixes on message opcodes

AztecProtocol · Mar 4, 2024 · fa53136 · fa53136
1 parent 64955f6
commit fa53136
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/yarn-project/simulator/src/avm/fixtures/index.ts b/yarn-project/simulator/src/avm/fixtures/index.ts
@@ -105,9 +105,11 @@ export function allSameExcept(original: any, overrides: any): any {
 /**
  * Create an empty L1ToL2Message oracle input
  */
-export function initL1ToL2MessageOracleInput(leafIndex?: bigint): any {
+export function initL1ToL2MessageOracleInput(
+  leafIndex?: bigint,
+): MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT> {
   return new MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>(
-    leafIndex ? leafIndex : BigInt(0),
+    leafIndex ?? 0n,
     new SiblingPath(L1_TO_L2_MSG_TREE_HEIGHT, Array(L1_TO_L2_MSG_TREE_HEIGHT)),
   );
 }
diff --git a/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts
@@ -280,7 +280,7 @@ describe('Accrued Substate', () => {
     });
   });
 
-  describe('L1ToL1MessageExists', () => {
+  describe('L1ToL2MessageExists', () => {
     it('Should (de)serialize correctly', () => {
       const buf = Buffer.from([
         L1ToL2MessageExists.opcode, // opcode
@@ -397,7 +397,7 @@ describe('Accrued Substate', () => {
       expect(inst.serialize()).toEqual(buf);
     });
 
-    it('Should append l1 to l2 messages correctly', async () => {
+    it('Should append l2 to l1 messages correctly', async () => {
       const recipientOffset = 0;
       const recipient = new Fr(42);
       const contentOffset = 1;

diff --git a/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts
@@ -140,10 +140,6 @@ export class L1ToL2MessageExists extends Instruction {
   }
 
   async execute(context: AvmContext): Promise<void> {
-    if (context.environment.isStaticCall) {
-      throw new StaticCallStorageAlterError();
-    }
-
     const msgHash = context.machineState.memory.get(this.msgHashOffset).toFr();
     const msgLeafIndex = context.machineState.memory.get(this.msgLeafIndexOffset).toFr();
     const exists = await context.persistableState.checkL1ToL2MessageExists(msgHash, msgLeafIndex);