A0-3185: split rmc

README.md

@@ -60,7 +60,7 @@ More details are available [in the book][reference-link-implementation-details].
 - Import AlephBFT in your crate
   ```toml
   [dependencies]
-  aleph-bft = "^0.30"
+  aleph-bft = "^0.31"
   ```
 - The main entry point is the `run_session` function, which returns a Future that runs the
   consensus algorithm.

consensus/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aleph-bft"
-version = "0.30.0"
+version = "0.31.0"
 edition = "2021"
 authors = ["Cardinal Cryptography"]
 categories = ["algorithms", "data-structures", "cryptography", "database"]
@@ -13,7 +13,7 @@ readme = "../README.md"
 description = "AlephBFT is an asynchronous and Byzantine fault tolerant consensus protocol aimed at ordering arbitrary messages (transactions). It has been designed to continuously operate even in the harshest conditions: with no bounds on message-delivery delays and in the presence of malicious actors. This makes it an excellent fit for blockchain-related applications."
 
 [dependencies]
-aleph-bft-rmc = { path = "../rmc", version = "0.10" }
+aleph-bft-rmc = { path = "../rmc", version = "0.11" }
 aleph-bft-types = { path = "../types", version = "0.10" }
 anyhow = "1.0"
 async-trait = "0.1"

consensus/src/alerts/handler.rs

@@ -3,7 +3,7 @@ use crate::{
     Data, Hasher, Keychain, MultiKeychain, Multisigned, NodeIndex, PartialMultisignature,
     Recipient, SessionId, Signature, Signed, UncheckedSigned,
 };
-use aleph_bft_rmc::Message as RmcMessage;
+use aleph_bft_rmc::RmcHash;
 use aleph_bft_types::Round;
 use codec::{Decode, Encode};
 use std::{
@@ -66,7 +66,7 @@ type OnAlertRequestResponse<H, D, MK> = (
 
 #[derive(Clone, Eq, PartialEq, Hash, Debug, Decode, Encode)]
 pub enum RmcResponse<H: Hasher, S: Signature, MS: PartialMultisignature> {
-    RmcMessage(RmcMessage<H::Hash, S, MS>),
+    RmcMessage(RmcHash<H::Hash, S, MS>),
     AlertRequest(H::Hash, Recipient),
     Noop,
 }
@@ -223,7 +223,7 @@ impl<H: Hasher, D: Data, MK: MultiKeychain> Handler<H, D, MK> {
     pub fn on_rmc_message(
         &self,
         sender: NodeIndex,
-        message: RmcMessage<H::Hash, MK::Signature, MK::PartialMultisignature>,
+        message: RmcHash<H::Hash, MK::Signature, MK::PartialMultisignature>,
     ) -> RmcResponse<H, MK::Signature, MK::PartialMultisignature> {
         let hash = message.hash();
         if let Some(alert) = self.known_alerts.get(hash) {
@@ -279,12 +279,13 @@ mod tests {
     use crate::{
         alerts::{
             handler::{Error, Handler, RmcResponse},
-            Alert, AlertMessage, ForkProof, ForkingNotification, RmcMessage,
+            Alert, AlertMessage, ForkProof, ForkingNotification,
         },
         units::{ControlHash, FullUnit, PreUnit},
         PartiallyMultisigned, Recipient, Round,
     };
     use aleph_bft_mock::{Data, Hasher64, Keychain, Signature};
+    use aleph_bft_rmc::RmcHash;
     use aleph_bft_types::{NodeCount, NodeIndex, NodeMap, Signable, Signed};
 
     type TestForkProof = ForkProof<Hasher64, Data, Signature>;
@@ -375,8 +376,7 @@ mod tests {
         let alert_hash = Signable::hash(&alert);
         let signed_alert_hash =
             Signed::sign_with_index(alert_hash, &alerter_keychain).into_unchecked();
-        let response =
-            this.on_rmc_message(alerter_index, RmcMessage::SignedHash(signed_alert_hash));
+        let response = this.on_rmc_message(alerter_index, RmcHash::SignedHash(signed_alert_hash));
         assert_eq!(
             response,
             RmcResponse::AlertRequest(alert_hash, Recipient::Node(alerter_index),),
@@ -460,7 +460,7 @@ mod tests {
                 empty_alert_hash,
             )),
         );
-        let message = RmcMessage::MultisignedHash(multisigned_empty_alert_hash.into_unchecked());
+        let message = RmcHash::MultisignedHash(multisigned_empty_alert_hash.into_unchecked());
         assert_eq!(
             this.on_rmc_message(other_honest_node, message.clone()),
             RmcResponse::RmcMessage(message),
@@ -489,7 +489,7 @@ mod tests {
                 &keychains[double_committer.0],
             );
         }
-        let message = RmcMessage::MultisignedHash(multisigned_nonempty_alert_hash.into_unchecked());
+        let message = RmcHash::MultisignedHash(multisigned_nonempty_alert_hash.into_unchecked());
         assert_eq!(
             this.on_network_alert(signed_nonempty_alert),
             Err(Error::RepeatedAlert(double_committer, forker_index)),
@@ -547,7 +547,7 @@ mod tests {
                 &keychains[double_committer.0],
             );
         }
-        let message = RmcMessage::MultisignedHash(multisigned_nonempty_alert_hash.into_unchecked());
+        let message = RmcHash::MultisignedHash(multisigned_nonempty_alert_hash.into_unchecked());
         assert_eq!(
             this.on_network_alert(signed_nonempty_alert),
             Err(Error::RepeatedAlert(double_committer, forker_index)),

consensus/src/alerts/mod.rs

@@ -2,7 +2,7 @@ use crate::{
     units::UncheckedSignedUnit, Data, Hasher, Index, Keychain, MultiKeychain, Multisigned,
     NodeIndex, PartialMultisignature, Signable, Signature, UncheckedSigned,
 };
-use aleph_bft_rmc::Message as RmcMessage;
+use aleph_bft_rmc::RmcHash;
 use codec::{Decode, Encode};
 use derivative::Derivative;
 use parking_lot::RwLock;
@@ -12,7 +12,7 @@ mod handler;
 mod service;
 
 pub use handler::Handler;
-pub use service::Service;
+pub use service::{Service, IO};
 
 pub type ForkProof<H, D, S> = (UncheckedSignedUnit<H, D, S>, UncheckedSignedUnit<H, D, S>);
 
@@ -106,7 +106,7 @@ pub enum AlertMessage<H: Hasher, D: Data, S: Signature, MS: PartialMultisignatur
     /// Alert regarding forks, signed by the person claiming misconduct.
     ForkAlert(UncheckedSigned<Alert<H, D, S>, S>),
     /// An internal RMC message, together with the id of the sender.
-    RmcMessage(NodeIndex, RmcMessage<H::Hash, S, MS>),
+    RmcHash(NodeIndex, RmcHash<H::Hash, S, MS>),
     /// A request by a node for a fork alert identified by the given hash.
     AlertRequest(NodeIndex, H::Hash),
 }
@@ -115,7 +115,7 @@ impl<H: Hasher, D: Data, S: Signature, MS: PartialMultisignature> AlertMessage<H
     pub fn included_data(&self) -> Vec<D> {
         match self {
             Self::ForkAlert(unchecked_alert) => unchecked_alert.as_signable().included_data(),
-            Self::RmcMessage(_, _) => Vec::new(),
+            Self::RmcHash(_, _) => Vec::new(),
             Self::AlertRequest(_, _) => Vec::new(),
         }
     }