Skip to content

Commit

Permalink
Add impls for ToClvm and FromClvm to bool (#487)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rigidity committed Apr 23, 2024
1 parent 1a43234 commit 95d3e81
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
26 changes: 26 additions & 0 deletions crates/clvm-traits/src/from_clvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,19 @@ clvm_primitive!(i128);
clvm_primitive!(usize);
clvm_primitive!(isize);

impl<N> FromClvm<N> for bool {
fn from_clvm(decoder: &impl ClvmDecoder<Node = N>, node: N) -> Result<Self, FromClvmError> {
let atom = decoder.decode_atom(&node)?;
match atom.as_ref() {
[] => Ok(false),
[1] => Ok(true),
_ => Err(FromClvmError::Custom(
"expected boolean value of either `()` or `1`".to_string(),
)),
}
}
}

impl<N, A, B> FromClvm<N> for (A, B)
where
A: FromClvm<N>,
Expand Down Expand Up @@ -211,6 +224,19 @@ mod tests {
assert_eq!(decode(a, "8180"), Ok(-128i8));
}

#[test]
fn test_bool() {
let a = &mut Allocator::new();
assert_eq!(decode(a, "80"), Ok(false));
assert_eq!(decode(a, "01"), Ok(true));
assert_eq!(
decode::<bool>(a, "05"),
Err(FromClvmError::Custom(
"expected boolean value of either `()` or `1`".to_string(),
))
)
}

#[test]
fn test_pair() {
let a = &mut Allocator::new();
Expand Down
13 changes: 13 additions & 0 deletions crates/clvm-traits/src/to_clvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ clvm_primitive!(i128);
clvm_primitive!(usize);
clvm_primitive!(isize);

impl<N> ToClvm<N> for bool {
fn to_clvm(&self, encoder: &mut impl ClvmEncoder<Node = N>) -> Result<N, ToClvmError> {
(if *self { 1 } else { 0 }).to_clvm(encoder)
}
}

impl<N, T> ToClvm<N> for &T
where
T: ToClvm<N>,
Expand Down Expand Up @@ -173,6 +179,13 @@ mod tests {
assert_eq!(encode(a, -128i8), Ok("8180".to_owned()));
}

#[test]
fn test_bool() {
let a = &mut Allocator::new();
assert_eq!(encode(a, true), Ok("01".to_owned()));
assert_eq!(encode(a, false), Ok("80".to_owned()));
}

#[test]
fn test_reference() {
let a = &mut Allocator::new();
Expand Down

0 comments on commit 95d3e81

Please sign in to comment.