Add sum macro

informalsystems · Aug 12, 2024 · 767463f · 767463f
1 parent ed119a9
commit 767463f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs
@@ -3,9 +3,9 @@ use cgp_core::error::HasErrorType;
 use crate::impls::encode_mut::variant::SumEncoders;
 use crate::impls::encode_mut::with_context::EncodeWithContext;
 use crate::traits::encode_mut::{HasEncodeBufferType, MutEncoder};
-use crate::types::either::{Either, Void};
+use crate::types::either::Either;
 use crate::types::nat::Z;
-use crate::HList;
+use crate::{HList, Sum};
 
 pub struct EncodeOption;
 
@@ -14,7 +14,7 @@ pub type OptionEncoder = SumEncoders<Z, HList![EncodeWithContext, EncodeWithCont
 impl<Encoding, Strategy, Value> MutEncoder<Encoding, Strategy, Option<Value>> for EncodeOption
 where
     Encoding: HasEncodeBufferType + HasErrorType,
-    OptionEncoder: for<'a> MutEncoder<Encoding, Strategy, Either<&'a Value, Either<(), Void>>>,
+    OptionEncoder: for<'a> MutEncoder<Encoding, Strategy, Sum![&'a Value, ()]>,
 {
     fn encode_mut(
         encoding: &Encoding,

diff --git a/relayer/crates/cairo-encoding-components/src/macros.rs b/relayer/crates/cairo-encoding-components/src/macros.rs
@@ -10,3 +10,22 @@ macro_rules! HList {
     ( $e, $crate::HList!( $($tail)* ) )
   };
 }
+
+#[macro_export]
+macro_rules! Sum {
+  ( $(,)? ) => {
+    crate::types::either::Void
+  };
+  ( $e:ty ) => {
+    crate::types::either::Either<
+      $e,
+      crate::types::either::Void
+    >
+  };
+  ( $e:ty, $($tail:tt)* ) => {
+    crate::types::either::Either<
+      $e,
+      $crate::Sum!( $($tail)* )
+    >
+  };
+}