add composite actions and inputs

Author: sapinb

crates/cac/protocol/src/composite.rs

@@ -0,0 +1,24 @@
+//! Combined inputs and actions of all state machines.
+
+use crate::{
+    evaluator::{ActionContainer as EvaluatorActionContainer, input::Input as EvaluatorInput},
+    garbler::{ActionContainer as GarblerActionContainer, input::Input as GarblerInput},
+};
+
+/// All possible state machine inputs
+#[derive(Debug)]
+pub enum Input {
+    /// Garbler SM inputs
+    Garbler(GarblerInput),
+    /// Evaluator SM inputs
+    Evaluator(EvaluatorInput),
+}
+
+/// All possible action container outputs
+#[derive(Debug)]
+pub enum ActionContainer {
+    /// Garbler action container
+    Garbler(GarblerActionContainer),
+    /// Evaluator action container
+    Evaluator(EvaluatorActionContainer),
+}

crates/cac/protocol/src/evaluator/mod.rs

@@ -34,7 +34,7 @@ impl<S: EvaluatorArtifactStore> StateMachine for EvaluatorSM<S> {
 
     type UntrackedAction = EvaluatorUntrackedAction;
 
-    type Actions = Vec<Action<EvaluatorUntrackedAction, EvaluatorTrackedActionTypes>>;
+    type Actions = ActionContainer;
 
     type TransitionError = SMError;
 
@@ -89,3 +89,5 @@ impl TrackedActionTypes for EvaluatorTrackedActionTypes {
 
     type Result = ();
 }
+
+pub type ActionContainer = Vec<Action<EvaluatorUntrackedAction, EvaluatorTrackedActionTypes>>;

crates/cac/protocol/src/garbler/mod.rs

@@ -34,7 +34,7 @@ impl<S: GarblerArtifactStore> StateMachine for GarblerSM<S> {
 
     type UntrackedAction = GarblerUntrackedAction;
 
-    type Actions = Vec<Action<GarblerUntrackedAction, GarblerTrackedActionTypes>>;
+    type Actions = ActionContainer;
 
     type TransitionError = SMError;
 
@@ -89,3 +89,5 @@ impl TrackedActionTypes for GarblerTrackedActionTypes {
 
     type Result = ();
 }
+
+pub type ActionContainer = Vec<Action<GarblerUntrackedAction, GarblerTrackedActionTypes>>;

crates/cac/protocol/src/lib.rs

@@ -1,5 +1,6 @@
 //! protocol state machines
 
+pub mod composite;
 pub mod deposit;
 mod error;
 pub mod evaluator;