Addressing omitted feedback from PR #13038

Author: jeanmon

barretenberg/cpp/src/barretenberg/vm/avm/trace/deserialization.hpp

@@ -8,9 +8,8 @@
 
 namespace bb::avm_trace {
 
-// Possible types for an instruction's operand in its wire format. (Keep in sync with TS code.
-// See avm/serialization/instruction_serialization.ts).
-// Note that the TAG enum value is not supported in TS and is parsed as UINT8.
+// Possible types for an instruction's operand in its wire format.
+// The counterpart TS file is: avm/serialization/instruction_serialization.ts.
 // INDIRECT is parsed as UINT8 where the bits represent the operands that have indirect mem access.
 enum class OperandType : uint8_t { INDIRECT8, INDIRECT16, TAG, UINT8, UINT16, UINT32, UINT64, UINT128, FF };
 

barretenberg/cpp/src/barretenberg/vm2/simulation/lib/serialization.hpp

@@ -13,7 +13,7 @@
 namespace bb::avm2::simulation {
 
 // Possible types for an instruction's operand in its wire format.
-// Note that the TAG enum value is not supported in TS and is parsed as UINT8.
+// The counterpart TS file is: avm/serialization/instruction_serialization.ts.
 // INDIRECT is parsed as UINT8 where the bits represent the operands that have indirect mem access.
 enum class OperandType : uint8_t { INDIRECT8, INDIRECT16, TAG, UINT8, UINT16, UINT32, UINT64, UINT128, FF };
 

yarn-project/simulator/src/public/avm/serialization/instruction_serialization.ts

@@ -93,10 +93,8 @@ export const MAX_OPCODE_VALUE = Math.max(
     .filter(k => !isNaN(k)),
 );
 
-// Possible types for an instruction's operand in its wire format. (Keep in sync with CPP code.
-// See vm/avm_trace/deserialization.cpp)
-// Note that cpp code introduced an additional enum value TAG to express the instruction tag. In TS,
-// this one is parsed as UINT8.
+// Possible types for an instruction's operand in its wire format.
+// The counterpart cpp file is: vm2/simulation/lib/serialization.hpp.
 export enum OperandType {
   UINT8,
   UINT16,
@@ -186,7 +184,7 @@ export function deserialize(cursor: BufferCursor | Buffer, operands: OperandType
     if (operands[i] === OperandType.TAG) {
       // We parsed a single byte (readUInt8()) and therefore value is of number type (not bigint)
       // We need to cast to number because checkIsValidTag expects a number.
-      TaggedMemory.checkIsValidTag(Number(argValues[i]) ?? 0);
+      TaggedMemory.checkIsValidTag(Number(argValues[i] ?? 0));
     }
   }