[refactor]: Split view changes from normal messages

Signed-off-by: Sam H. Smith <[email protected]>
hyperledger-iroha · Dec 14, 2023 · 1523d89 · 1523d89
1 parent a2ff9a0
commit 1523d89
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 204 deletions.
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,11 +233,10 @@ pub mod message {
                     }
                 }
                 Message::ShareBlocks(ShareBlocks { blocks, .. }) => {
-                    use crate::sumeragi::message::{Message, MessagePacket};
+                    use crate::sumeragi::message::{BlockMessage, Message};
                     for block in blocks.clone() {
-                        block_sync.sumeragi.incoming_message(MessagePacket::new(
-                            ProofChain::default(),
-                            Some(Message::BlockSyncUpdate(block.into())),
+                        block_sync.sumeragi.incoming_message(Message::Block(
+                            BlockMessage::BlockSyncUpdate(block.into()),
                         ));
                     }
                 }

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -27,7 +27,7 @@ use tokio::sync::broadcast;
 
 use crate::{
     block_sync::message::Message as BlockSyncMessage, prelude::*,
-    sumeragi::message::MessagePacket as SumeragiPacket,
+    sumeragi::message::Message as SumeragiPacket,
 };
 
 /// The interval at which sumeragi checks if there are tx in the `queue`.