From b030e1facef7dc470dc95b699834a5e50d6675d1 Mon Sep 17 00:00:00 2001
From: Giacomo Pasini <g.pasini98@gmail.com>
Date: Wed, 20 Sep 2023 19:01:09 +0200
Subject: [PATCH] fix tests

---
 nomos-services/mempool/src/lib.rs    |  4 ++--
 nomos-services/mempool/tests/mock.rs | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/nomos-services/mempool/src/lib.rs b/nomos-services/mempool/src/lib.rs
index 53a7b7c37..728b46815 100644
--- a/nomos-services/mempool/src/lib.rs
+++ b/nomos-services/mempool/src/lib.rs
@@ -83,7 +83,7 @@ where
                 )
             }
             #[cfg(test)]
-            Self::BlockItem { block, .. } => {
+            Self::BlockItems { block, .. } => {
                 write!(f, "MempoolMsg::BlockItem{{block: {block:?}}}")
             }
             Self::Metrics { .. } => write!(f, "MempoolMsg::Metrics"),
@@ -173,7 +173,7 @@ where
                             pool.mark_in_block(&ids, block);
                         }
                         #[cfg(test)]
-                        MempoolMsg::BlockTransaction { block, reply_channel } => {
+                        MempoolMsg::BlockItems { block, reply_channel } => {
                             reply_channel.send(pool.block_items(block)).unwrap_or_else(|_| {
                                 tracing::debug!("could not send back block items")
                             });
diff --git a/nomos-services/mempool/tests/mock.rs b/nomos-services/mempool/tests/mock.rs
index c317fb716..5da22e72a 100644
--- a/nomos-services/mempool/tests/mock.rs
+++ b/nomos-services/mempool/tests/mock.rs
@@ -1,4 +1,7 @@
-use nomos_core::{block::BlockId, tx::mock::MockTransaction};
+use nomos_core::{
+    block::BlockId,
+    tx::mock::{MockTransaction, MockTxId},
+};
 use nomos_log::{Logger, LoggerSettings};
 use nomos_network::{
     backends::mock::{Mock, MockBackendMessage, MockConfig, MockMessage},
@@ -10,14 +13,16 @@ use overwatch_rs::{overwatch::OverwatchRunner, services::handle::ServiceHandle};
 use nomos_mempool::{
     backend::mockpool::MockPool,
     network::adapters::mock::{MockAdapter, MOCK_TX_CONTENT_TOPIC},
-    MempoolMsg, MempoolService,
+    MempoolMsg, MempoolService, Settings
 };
 
 #[derive(Services)]
 struct MockPoolNode {
     logging: ServiceHandle<Logger>,
     network: ServiceHandle<NetworkService<Mock>>,
-    mockpool: ServiceHandle<MempoolService<MockAdapter, MockPool<MockTransaction<MockMessage>>>>,
+    mockpool: ServiceHandle<
+        MempoolService<MockAdapter, MockPool<MockTransaction<MockMessage>, MockTxId>>,
+    >,
 }
 
 #[test]
@@ -56,7 +61,10 @@ fn test_mockmempool() {
                     weights: None,
                 },
             },
-            mockpool: (),
+            mockpool: Settings {
+                backend: (),
+                network: (),
+            },
             logging: LoggerSettings::default(),
         },
         None,
@@ -67,7 +75,7 @@ fn test_mockmempool() {
     let network = app.handle().relay::<NetworkService<Mock>>();
     let mempool = app
         .handle()
-        .relay::<MempoolService<MockAdapter, MockPool<MockTransaction<MockMessage>>>>();
+        .relay::<MempoolService<MockAdapter, MockPool<MockTransaction<MockMessage>, MockTxId>>>();
 
     app.spawn(async move {
         let network_outbound = network.connect().await.unwrap();