Fixes merge conflicts

Refactors message handling in mock network tests for better readability and clarity.
This ensures messages are processed as expected in concurrent scenarios.

Author: thep2p

Makefile

@@ -21,4 +21,8 @@ install-tools: install-lint install-rustfmt
 .PHONEY test:
 test:
 	@echo "Running tests"
-	@cargo test
+	@cargo test
+.PHONY format:
+format:
+	@echo "Formatting code"
+	@cargo fmt --all -- --check

src/network/mock/hub.rs

@@ -21,8 +21,13 @@ impl NetworkHub {
     }
 
     /// Creates a new mock network with the given identifier and registers it in the hub.
-    pub fn new_mock_network(hub: Arc<Mutex<Self>>, identifier: Identifier) -> anyhow::Result<Arc<Mutex<MockNetwork>>> {
-        let inner_hub = hub.lock().map_err(|_| anyhow!("Failed to acquire lock on hub"))?;
+    pub fn new_mock_network(
+        hub: Arc<Mutex<Self>>,
+        identifier: Identifier,
+    ) -> anyhow::Result<Arc<Mutex<MockNetwork>>> {
+        let inner_hub = hub
+            .lock()
+            .map_err(|_| anyhow!("Failed to acquire lock on hub"))?;
         let mut inner_networks = inner_hub
             .networks
             .write()

src/network/mock/network_test.rs

@@ -4,6 +4,11 @@ use std::sync::{Arc, Mutex, Barrier};
 use std::thread;
 use crate::core::testutil::fixtures::random_identifier;
 use crate::network::mock::hub::NetworkHub;
+use crate::network::Payload::TestMessage;
+use crate::network::{Message, MessageProcessor, Network};
+use std::collections::HashSet;
+use std::sync::{Arc, Barrier, Mutex};
+use std::thread;
 
 #[derive(Debug)]
 struct MockMessageProcessor {
@@ -125,9 +130,8 @@ fn test_concurrent_message_sending() {
     let mock_net_2 = NetworkHub::new_mock_network(hub, id_2).unwrap();
 
     // Create 10 different message contents
-    let message_contents: Vec<String> = (0..10)
-        .map(|i| format!("Concurrent message {i}"))
-        .collect();
+    let message_contents: Vec<String> =
+        (0..10).map(|i| format!("Concurrent message {i}")).collect();
 
     // Set up a barrier to synchronize all threads
     let barrier = Arc::new(Barrier::new(10));
@@ -142,7 +146,7 @@ fn test_concurrent_message_sending() {
 
         let handle = thread::spawn(move || {
             let message = Message {
-                payload: Payload::TestMessage(content),
+                payload: TestMessage(content),
                 target_node_id: id_1_copy,
             };
 
@@ -165,7 +169,10 @@ fn test_concurrent_message_sending() {
     // Verify that all messages were received
     let processor = msg_proc_1.lock().unwrap();
     for content in message_contents {
-        assert!(processor.has_seen(&content), "Message '{content}' was not received");
+        assert!(
+            processor.has_seen(&content),
+            "Message '{content}' was not received"
+        );
         println!("Message '{content}' was successfully processed");
     }
 }