Просмотр исходного кода

zkas: Use hex values for from_repr() calls.

parazyd 4 лет назад
Родитель
Сommit
9335ae31ea
2 измененных файлов с 17 добавлено и 17 удалено
  1. 9 9
      zkas/src/opcode.rs
  2. 8 8
      zkas/src/types.rs

+ 9 - 9
zkas/src/opcode.rs

@@ -54,15 +54,15 @@ impl Opcode {
 
 
     pub fn from_repr(b: u8) -> Self {
     pub fn from_repr(b: u8) -> Self {
         match b {
         match b {
-            0 => Self::EcAdd,
-            1 => Self::EcMul,
-            2 => Self::EcMulBase,
-            3 => Self::EcMulShort,
-            8 => Self::EcGetX,
-            9 => Self::EcGetY,
-            16 => Self::PoseidonHash,
-            32 => Self::CalculateMerkleRoot,
-            240 => Self::ConstrainInstance,
+            0x00 => Self::EcAdd,
+            0x01 => Self::EcMul,
+            0x02 => Self::EcMulBase,
+            0x03 => Self::EcMulShort,
+            0x08 => Self::EcGetX,
+            0x09 => Self::EcGetY,
+            0x10 => Self::PoseidonHash,
+            0x20 => Self::CalculateMerkleRoot,
+            0xf0 => Self::ConstrainInstance,
             _ => unimplemented!(),
             _ => unimplemented!(),
         }
         }
     }
     }

+ 8 - 8
zkas/src/types.rs

@@ -31,14 +31,14 @@ pub enum Type {
 impl Type {
 impl Type {
     pub fn from_repr(b: u8) -> Self {
     pub fn from_repr(b: u8) -> Self {
         match b {
         match b {
-            0 => Self::EcPoint,
-            1 => Self::EcFixedPoint,
-            16 => Self::Base,
-            17 => Self::BaseArray,
-            18 => Self::Scalar,
-            19 => Self::ScalarArray,
-            32 => Self::MerklePath,
-            48 => Self::Uint32,
+            0x00 => Self::EcPoint,
+            0x01 => Self::EcFixedPoint,
+            0x10 => Self::Base,
+            0x11 => Self::BaseArray,
+            0x12 => Self::Scalar,
+            0x13 => Self::ScalarArray,
+            0x20 => Self::MerklePath,
+            0x30 => Self::Uint32,
             _ => unimplemented!(),
             _ => unimplemented!(),
         }
         }
     }
     }