[consensus] codec migration (Attempt 2)

consensus/Cargo.toml

@@ -15,9 +15,9 @@ commonware-codec = { workspace = true }
 commonware-cryptography = { workspace = true }
 commonware-utils = { workspace = true }
 bytes = { workspace = true }
-prost = { workspace = true }
 cfg-if = { workspace = true }
 thiserror = { workspace = true }
+futures = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 commonware-macros = { workspace = true }
@@ -26,14 +26,10 @@ commonware-runtime = { workspace = true }
 commonware-storage = { workspace = true }
 prometheus-client = { workspace = true }
 governor = { workspace = true }
-futures = { workspace = true }
 rand = { workspace = true }
 rand_distr = { workspace = true }
 tracing = { workspace = true }
 
-[build-dependencies]
-prost-build = { workspace = true }
-
 [dev-dependencies]
 tracing-subscriber = { workspace = true }
 

consensus/src/lib.rs

@@ -5,23 +5,10 @@
 //! `commonware-consensus` is **ALPHA** software and is not yet recommended for production use. Developers should
 //! expect breaking changes and occasional instability.
 
-use bytes::Bytes;
-
 pub mod ordered_broadcast;
 pub mod simplex;
 pub mod threshold_simplex;
 
-/// Activity is specified by the underlying consensus implementation and can be interpreted if desired.
-///
-/// Examples of activity would be "vote", "finalize", or "fault". Various consensus implementations may
-/// want to reward (or penalize) participation in different ways and in different places. For example,
-/// validators could be required to send multiple types of messages (i.e. vote and finalize) and rewarding
-/// both equally may better align incentives with desired behavior.
-pub type Activity = u8;
-
-/// Proof is a blob that attests to some data.
-pub type Proof = Bytes;
-
 cfg_if::cfg_if! {
     if #[cfg(not(target_arch = "wasm32"))] {
         use commonware_utils::Array;
@@ -35,16 +22,6 @@ cfg_if::cfg_if! {
             0.9, 1.0, 1.25, 1.5, 1.75, 2.0, 3.0,
         ];
 
-        /// Parsed is a wrapper around a message that has a parsable digest.
-        #[derive(Clone)]
-        struct Parsed<Message, Digest> {
-            /// Raw message that has some field that can be parsed into a digest.
-            pub message: Message,
-
-            /// Parsed digest.
-            pub digest: Digest,
-        }
-
         /// Automaton is the interface responsible for driving the consensus forward by proposing new payloads
         /// and verifying payloads proposed by other participants.
         pub trait Automaton: Clone + Send + 'static {
@@ -96,18 +73,18 @@ cfg_if::cfg_if! {
             fn broadcast(&mut self, payload: Self::Digest) -> impl Future<Output = ()> + Send;
         }
 
-        /// Committer is the interface responsible for handling notifications of payload status.
-        pub trait Committer: Clone + Send + 'static {
-            /// Hash of an arbitrary payload.
-            type Digest: Digest;
-
-            /// Event that a payload has made some progress towards finalization but is not yet finalized.
+        /// Reporter is the interface responsible for reporting activity to some external actor.
+        pub trait Reporter: Clone + Send + 'static {
+            /// Activity is specified by the underlying consensus implementation and can be interpreted if desired.
             ///
-            /// This is often used to provide an early ("best guess") confirmation to users.
-            fn prepared(&mut self, proof: Proof, payload: Self::Digest) -> impl Future<Output = ()> + Send;
+            /// Examples of activity would be "vote", "finalize", or "fault". Various consensus implementations may
+            /// want to reward (or penalize) participation in different ways and in different places. For example,
+            /// validators could be required to send multiple types of messages (i.e. vote and finalize) and rewarding
+            /// both equally may better align incentives with desired behavior.
+            type Activity;
 
-            /// Event indicating the container has been finalized.
-            fn finalized(&mut self, proof: Proof, payload: Self::Digest) -> impl Future<Output = ()> + Send;
+            /// Report some activity observed by the consensus implementation.
+            fn report(&mut self, activity: Self::Activity) -> impl Future<Output = ()> + Send;
         }
 
         /// Supervisor is the interface responsible for managing which participants are active at a given time.
@@ -140,9 +117,6 @@ cfg_if::cfg_if! {
 
             // Indicate whether some candidate is a participant at the given view.
             fn is_participant(&self, index: Self::Index, candidate: &Self::PublicKey) -> Option<u32>;
-
-            /// Report some activity observed by the consensus implementation.
-            fn report(&self, activity: Activity, proof: Proof) -> impl Future<Output = ()> + Send;
         }
 
         /// ThresholdSupervisor is the interface responsible for managing which `identity` (typically a group polynomial with
@@ -180,7 +154,7 @@ cfg_if::cfg_if! {
         /// Monitor is used to implement mechanisms that share the same set of active participants as consensus and/or
         /// perform some activity that requires some synchronization with the progress of consensus.
         ///
-        /// Monitor can be implemented using [`Committer`](crate::Committer) to avoid introducing complexity
+        /// Monitor can be implemented using [`Reporter`](crate::Reporter) to avoid introducing complexity
         /// into any particular consensus implementation.
         pub trait Monitor: Clone + Send + 'static {
             /// Index is the type used to indicate the in-progress consensus decision.