Test MatchByte round trip for each byte value and fix bug

Chia-Network · Jul 15, 2024 · f2ee35a · f2ee35a
1 parent 1d3ee19
commit f2ee35a
Showing 1 changed file with 50 additions and 3 deletions.
diff --git a/crates/clvm-traits/src/match_byte.rs b/crates/clvm-traits/src/match_byte.rs
@@ -1,4 +1,4 @@
-use num_bigint::BigInt;
+use clvmr::Atom;
 
 use crate::{ClvmDecoder, ClvmEncoder, FromClvm, FromClvmError, ToClvm, ToClvmError};
 
@@ -7,18 +7,65 @@ pub struct MatchByte<const BYTE: u8>;
 
 impl<N, E: ClvmEncoder<Node = N>, const BYTE: u8> ToClvm<E> for MatchByte<BYTE> {
     fn to_clvm(&self, encoder: &mut E) -> Result<N, ToClvmError> {
-        encoder.encode_bigint(BigInt::from(BYTE))
+        encoder.encode_atom(Atom::Borrowed(if BYTE == 0 {
+            &[]
+        } else if BYTE < 0x80 {
+            &[BYTE]
+        } else {
+            &[0, BYTE]
+        }))
     }
 }
 
 impl<N, D: ClvmDecoder<Node = N>, const BYTE: u8> FromClvm<D> for MatchByte<BYTE> {
     fn from_clvm(decoder: &D, node: N) -> Result<Self, FromClvmError> {
         match decoder.decode_atom(&node)?.as_ref() {
             [] if BYTE == 0 => Ok(Self),
-            [byte] if *byte == BYTE && BYTE > 0 => Ok(Self),
+            [byte] if *byte == BYTE && BYTE > 0 && BYTE < 0x80 => Ok(Self),
+            [0, byte] if *byte == BYTE && BYTE >= 0x80 => Ok(Self),
             _ => Err(FromClvmError::Custom(format!(
                 "expected an atom with a single byte value of {BYTE}"
             ))),
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use clvmr::Allocator;
+
+    use super::*;
+
+    fn test_byte<const BYTE: u8>() {
+        let mut allocator = Allocator::new();
+        let match_byte = MatchByte::<BYTE>;
+        let encoded = match_byte.to_clvm(&mut allocator).unwrap();
+        MatchByte::<BYTE>::from_clvm(&allocator, encoded).unwrap();
+    }
+
+    macro_rules! test_bytes {
+        ( $( $byte:expr ),* ) => {
+            $( test_byte::<$byte>(); )*
+        };
+    }
+
+    #[test]
+    fn test_bytes() {
+        test_bytes!(
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+            24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+            46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+            68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+            90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+            109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+            126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
+            143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+            160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+            177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+            194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
+            211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+            228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+            245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+        );
+    }
+}