fix: dependency cycles in public simulator part 2 (serializable bytecode)

yarn-project/simulator/src/public/avm/opcodes/accrued_substate.test.ts

@@ -72,8 +72,8 @@ describe('Accrued Substate', () => {
         /*existsOffset=*/ 0x4567,
       );
 
-      expect(NoteHashExists.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(NoteHashExists.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     // Will check existence at leafIndex, but nothing may be found there and/or something may be found at mockAtLeafIndex
@@ -117,8 +117,8 @@ describe('Accrued Substate', () => {
       ]);
       const inst = new EmitNoteHash(/*indirect=*/ 0x01, /*offset=*/ 0x1234);
 
-      expect(EmitNoteHash.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(EmitNoteHash.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should append a new note hash correctly', async () => {
@@ -149,8 +149,8 @@ describe('Accrued Substate', () => {
         /*existsOffset=*/ 0x4567,
       );
 
-      expect(NullifierExists.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(NullifierExists.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     describe.each([[/*exists=*/ false], [/*exists=*/ true]])('Nullifier checks', (exists: boolean) => {
@@ -186,8 +186,8 @@ describe('Accrued Substate', () => {
       ]);
       const inst = new EmitNullifier(/*indirect=*/ 0x01, /*offset=*/ 0x1234);
 
-      expect(EmitNullifier.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(EmitNullifier.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should append a new nullifier correctly', async () => {
@@ -237,8 +237,8 @@ describe('Accrued Substate', () => {
         /*existsOffset=*/ 0xcdef,
       );
 
-      expect(L1ToL2MessageExists.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(L1ToL2MessageExists.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     // Will check existence at leafIndex, but nothing may be found there and/or something may be found at mockAtLeafIndex
@@ -284,8 +284,8 @@ describe('Accrued Substate', () => {
       ]);
       const inst = new EmitUnencryptedLog(/*indirect=*/ 0x01, /*offset=*/ 0x1234, /*lengthOffset=*/ 0xa234);
 
-      expect(EmitUnencryptedLog.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(EmitUnencryptedLog.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should append public logs correctly', async () => {
@@ -316,8 +316,8 @@ describe('Accrued Substate', () => {
       ]);
       const inst = new SendL2ToL1Message(/*indirect=*/ 0x01, /*recipientOffset=*/ 0x1234, /*contentOffset=*/ 0xa234);
 
-      expect(SendL2ToL1Message.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(SendL2ToL1Message.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should append l2 to l1 message correctly', async () => {

yarn-project/simulator/src/public/avm/opcodes/arithmetic.test.ts

@@ -26,8 +26,8 @@ describe('Arithmetic Instructions', () => {
         Add.wireFormat16,
       );
 
-      expect(Add.as(Add.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Add.as(Add.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     describe.each([
@@ -107,8 +107,8 @@ describe('Arithmetic Instructions', () => {
         Sub.wireFormat16,
       );
 
-      expect(Sub.as(Sub.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Sub.as(Sub.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     describe.each([
@@ -169,8 +169,8 @@ describe('Arithmetic Instructions', () => {
         Mul.wireFormat16,
       );
 
-      expect(Mul.as(Mul.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Mul.as(Mul.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     describe.each([
@@ -226,8 +226,8 @@ describe('Arithmetic Instructions', () => {
         Div.wireFormat16,
       );
 
-      expect(Div.as(Div.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Div.as(Div.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     describe.each([
@@ -263,8 +263,8 @@ describe('Arithmetic Instructions', () => {
         FieldDiv.wireFormat16,
       );
 
-      expect(FieldDiv.as(FieldDiv.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(FieldDiv.as(FieldDiv.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should perform field division', async () => {

yarn-project/simulator/src/public/avm/opcodes/bitwise.test.ts

@@ -25,8 +25,8 @@ describe('Bitwise instructions', () => {
         And.wireFormat16,
       );
 
-      expect(And.as(And.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(And.as(And.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should AND correctly over integral types', async () => {
@@ -54,8 +54,8 @@ describe('Bitwise instructions', () => {
         Or.wireFormat16,
       );
 
-      expect(Or.as(Or.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Or.as(Or.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should OR correctly over integral types', async () => {
@@ -87,8 +87,8 @@ describe('Bitwise instructions', () => {
         Xor.wireFormat16,
       );
 
-      expect(Xor.as(Xor.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Xor.as(Xor.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should XOR correctly over integral types', async () => {
@@ -120,8 +120,8 @@ describe('Bitwise instructions', () => {
         Shr.wireFormat16,
       );
 
-      expect(Shr.as(Shr.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Shr.as(Shr.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should require shift amount to be U8', async () => {
@@ -193,8 +193,8 @@ describe('Bitwise instructions', () => {
         Shl.wireFormat16,
       );
 
-      expect(Shl.as(Shl.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Shl.as(Shl.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should require shift amount to be U8', async () => {
@@ -279,8 +279,8 @@ describe('Bitwise instructions', () => {
         Not.wireFormat16,
       );
 
-      expect(Not.as(Not.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Not.as(Not.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should NOT correctly over integral types', async () => {

yarn-project/simulator/src/public/avm/opcodes/comparators.test.ts

@@ -26,8 +26,8 @@ describe('Comparators', () => {
         Eq.wireFormat16,
       );
 
-      expect(Eq.as(Eq.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Eq.as(Eq.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Works on integral types', async () => {
@@ -93,8 +93,8 @@ describe('Comparators', () => {
         Lt.wireFormat16,
       );
 
-      expect(Lt.as(Lt.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Lt.as(Lt.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Works on integral types', async () => {
@@ -160,8 +160,8 @@ describe('Comparators', () => {
         Lte.wireFormat16,
       );
 
-      expect(Lte.as(Lte.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Lte.as(Lte.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Works on integral types', async () => {

yarn-project/simulator/src/public/avm/opcodes/contract.test.ts

@@ -48,8 +48,8 @@ describe('Contract opcodes', () => {
         /*memberEnum=*/ 0x02,
       );
 
-      expect(GetContractInstance.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(GetContractInstance.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     describe.each([

yarn-project/simulator/src/public/avm/opcodes/control_flow.test.ts

@@ -19,8 +19,8 @@ describe('Control Flow Opcodes', () => {
       ]);
       const inst = new Jump(/*loc=*/ 0x12340000);
 
-      expect(Jump.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Jump.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should implement JUMP', async () => {
@@ -44,8 +44,8 @@ describe('Control Flow Opcodes', () => {
       ]);
       const inst = new JumpI(/*indirect=*/ 1, /*condOffset=*/ 0xa234, /*loc=*/ 0x12340000);
 
-      expect(JumpI.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(JumpI.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should implement JUMPI - truthy', async () => {
@@ -89,8 +89,8 @@ describe('Control Flow Opcodes', () => {
       ]);
       const inst = new InternalCall(/*loc=*/ 0x12340000);
 
-      expect(InternalCall.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(InternalCall.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should implement Internal Call and Return', async () => {

yarn-project/simulator/src/public/avm/opcodes/conversion.test.ts

@@ -32,8 +32,8 @@ describe('Conversion Opcodes', () => {
         /*dstOffset=*/ 0x5678,
       );
 
-      expect(ToRadixBE.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(ToRadixBE.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should decompose correctly to bytes - direct', async () => {

yarn-project/simulator/src/public/avm/opcodes/ec_add.test.ts

@@ -40,8 +40,8 @@ describe('EC Instructions', () => {
         /*dstOffset=*/ 0x1239,
       );
 
-      expect(EcAdd.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(EcAdd.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it(`Should double correctly`, async () => {

yarn-project/simulator/src/public/avm/opcodes/environment_getters.test.ts

@@ -54,8 +54,8 @@ describe('Environment getters', () => {
       GetEnvVar.wireFormat16,
     );
 
-    expect(GetEnvVar.as(GetEnvVar.wireFormat16).deserialize(buf)).toEqual(instr);
-    expect(instr.serialize()).toEqual(buf);
+    expect(GetEnvVar.as(GetEnvVar.wireFormat16).fromBuffer(buf)).toEqual(instr);
+    expect(instr.toBuffer()).toEqual(buf);
   });
 
   describe.each([

yarn-project/simulator/src/public/avm/opcodes/external_calls.test.ts

@@ -59,8 +59,8 @@ describe('External Calls', () => {
         /*argsSizeOffset=*/ 0xc234,
       );
 
-      expect(Call.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Call.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Call to non-existent bytecode returns failure', async () => {
@@ -227,8 +227,8 @@ describe('External Calls', () => {
         /*argsSizeOffset=*/ 0xc234,
       );
 
-      expect(StaticCall.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(StaticCall.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should fail if a static call attempts to touch storage', async () => {
@@ -279,8 +279,8 @@ describe('External Calls', () => {
       ]);
       const inst = new Return(/*indirect=*/ 0x01, /*returnOffset=*/ 0x1234, /*copySize=*/ 0xa234);
 
-      expect(Return.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Return.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should return data from the return opcode', async () => {
@@ -313,8 +313,8 @@ describe('External Calls', () => {
         Revert.wireFormat16,
       );
 
-      expect(Revert.as(Revert.wireFormat16).deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Revert.as(Revert.wireFormat16).fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should return data and revert from the revert opcode', async () => {
@@ -342,8 +342,8 @@ describe('External Calls', () => {
       ]);
       const inst = new SuccessCopy(/*indirect=*/ 0x12, /*dstOffset=*/ 0x5678);
 
-      expect(SuccessCopy.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(SuccessCopy.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should correctly copy success state for a successful call', async () => {

yarn-project/simulator/src/public/avm/opcodes/hashing.test.ts

@@ -24,8 +24,8 @@ describe('Hashing Opcodes', () => {
       ]);
       const inst = new Poseidon2(/*indirect=*/ 1, /*dstOffset=*/ 0x1234, /*messageOffset=*/ 0x2345);
 
-      expect(Poseidon2.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Poseidon2.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should hash correctly - direct', async () => {
@@ -98,8 +98,8 @@ describe('Hashing Opcodes', () => {
       ]);
       const inst = new KeccakF1600(/*indirect=*/ 1, /*dstOffset=*/ 0x1234, /*inputOffset=*/ 0x2345);
 
-      expect(KeccakF1600.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(KeccakF1600.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should permute correctly - direct', async () => {
@@ -156,8 +156,8 @@ describe('Hashing Opcodes', () => {
         /*inputsOffset=*/ 0x4567,
       );
 
-      expect(Sha256Compression.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
+      expect(Sha256Compression.fromBuffer(buf)).toEqual(inst);
+      expect(inst.toBuffer()).toEqual(buf);
     });
 
     it('Should hash correctly - direct', async () => {