[refactor]: Split view changes from normal messages

Signed-off-by: Sam H. Smith <[email protected]>
hyperledger-iroha · Dec 20, 2023 · c1e4b97 · c1e4b97
1 parent 50ec2bc
commit c1e4b97
Show file tree

Hide file tree

Showing 6 changed files with 170 additions and 225 deletions.
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -177,8 +177,11 @@ impl NetworkRelay {
         }
 
         match msg {
-            SumeragiPacket(data) => {
-                self.sumeragi.incoming_message(*data);
+            SumeragiBlock(data) => {
+                self.sumeragi.incoming_block_message(*data);
+            }
+            SumeragiControlFlow(data) => {
+                self.sumeragi.incoming_control_flow_message(*data);
             }
             BlockSync(data) => self.block_sync.message(*data).await,
             TransactionGossiper(data) => self.gossiper.gossip(*data).await,

diff --git a/core/src/block_sync.rs b/core/src/block_sync.rs
@@ -129,7 +129,6 @@ impl BlockSynchronizer {
 pub mod message {
     //! Module containing messages for [`BlockSynchronizer`](super::BlockSynchronizer).
     use super::*;
-    use crate::sumeragi::view_change::ProofChain;
 
     /// Get blocks after some block
     #[derive(Debug, Clone, Decode, Encode)]
@@ -234,12 +233,11 @@ pub mod message {
                     }
                 }
                 Message::ShareBlocks(ShareBlocks { blocks, .. }) => {
-                    use crate::sumeragi::message::{Message, MessagePacket};
+                    use crate::sumeragi::message::BlockMessage;
                     for block in blocks.clone() {
-                        block_sync.sumeragi.incoming_message(MessagePacket::new(
-                            ProofChain::default(),
-                            Some(Message::BlockSyncUpdate(block.into())),
-                        ));
+                        block_sync
+                            .sumeragi
+                            .incoming_block_message(BlockMessage::BlockSyncUpdate(block.into()));
                     }
                 }
             }

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -26,8 +26,9 @@ use parity_scale_codec::{Decode, Encode};
 use tokio::sync::broadcast;
 
 use crate::{
-    block_sync::message::Message as BlockSyncMessage, prelude::*,
-    sumeragi::message::MessagePacket as SumeragiPacket,
+    block_sync::message::Message as BlockSyncMessage,
+    prelude::*,
+    sumeragi::message::{BlockMessage, ControlFlowMessage},
 };
 
 /// The interval at which sumeragi checks if there are tx in the `queue`.
@@ -60,8 +61,10 @@ pub type EventsSender = broadcast::Sender<Event>;
 /// The network message
 #[derive(Clone, Debug, Encode, Decode)]
 pub enum NetworkMessage {
-    /// Blockchain message
-    SumeragiPacket(Box<SumeragiPacket>),
+    /// Blockchain concensus data message
+    SumeragiBlock(Box<BlockMessage>),
+    /// Blockchain concensus control flow message
+    SumeragiControlFlow(Box<ControlFlowMessage>),
     /// Block sync message
     BlockSync(Box<BlockSyncMessage>),
     /// Transaction gossiper message