From 0dd2b5ddd48f83383a73b1decd5e27dc68301512 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 5 Sep 2022 11:19:23 +0200
Subject: [PATCH] need an event reporter proxy

---
 src/fsfw/cfdp/handler/DestHandler.h        | 15 +++++++++++----
 unittests/cfdp/handler/testDestHandler.cpp | 12 +++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/fsfw/cfdp/handler/DestHandler.h b/src/fsfw/cfdp/handler/DestHandler.h
index 6b0493ad..f3e73f32 100644
--- a/src/fsfw/cfdp/handler/DestHandler.h
+++ b/src/fsfw/cfdp/handler/DestHandler.h
@@ -29,13 +29,20 @@ struct PacketInfo {
   PacketInfo() = default;
 };
 
+template <size_t SIZE>
+using LostSegmentsList = etl::set<etl::pair<uint64_t, uint64_t>, SIZE>;
+template <size_t SIZE>
+using PacketInfoList = etl::list<PacketInfo, SIZE>;
+using LostSegmentsListBase = etl::iset<etl::pair<uint64_t, uint64_t>>;
+using PacketInfoListBase = etl::ilist<PacketInfo>;
+
 struct DestHandlerParams {
   DestHandlerParams(LocalEntityCfg cfg, UserBase& user, RemoteConfigTableIF& remoteCfgTable,
-                    etl::ilist<PacketInfo>& packetList,
+                    PacketInfoListBase& packetList,
                     // TODO: This container can potentially take tons of space. For a better
                     //       memory efficient implementation, an additional abstraction could be
                     //       be used so users can use uint32_t as the pair type
-                    etl::iset<etl::pair<uint64_t, uint64_t>>& lostSegmentsContainer)
+                    LostSegmentsListBase& lostSegmentsContainer)
       : cfg(std::move(cfg)),
         user(user),
         remoteCfgTable(remoteCfgTable),
@@ -46,8 +53,8 @@ struct DestHandlerParams {
   UserBase& user;
   RemoteConfigTableIF& remoteCfgTable;
 
-  etl::ilist<PacketInfo>& packetListRef;
-  etl::iset<etl::pair<uint64_t, uint64_t>>& lostSegmentsContainer;
+  PacketInfoListBase& packetListRef;
+  LostSegmentsListBase& lostSegmentsContainer;
   uint8_t maxTlvsInOnePdu = 10;
   size_t maxFilenameLen = 255;
 };
diff --git a/unittests/cfdp/handler/testDestHandler.cpp b/unittests/cfdp/handler/testDestHandler.cpp
index 1b2de95e..9d6274e0 100644
--- a/unittests/cfdp/handler/testDestHandler.cpp
+++ b/unittests/cfdp/handler/testDestHandler.cpp
@@ -1,20 +1,30 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include "fsfw/cfdp.h"
+#include "mocks/AcceptsTmMock.h"
 #include "mocks/FilesystemMock.h"
+#include "mocks/MessageQueueMock.h"
 #include "mocks/cfdp/FaultHandlerMock.h"
 #include "mocks/cfdp/RemoteConfigTableMock.h"
 #include "mocks/cfdp/UserMock.h"
 
 TEST_CASE("CFDP Dest Handler", "[cfdp]") {
   using namespace cfdp;
+  MessageQueueId_t destQueueId = 2;
+  AcceptsTmMock tmReceiver(destQueueId);
+  MessageQueueMock mqMock(destQueueId);
   EntityId localId = EntityId(UnsignedByteField<uint16_t>(2));
   auto fhMock = FaultHandlerMock();
   auto localEntityCfg = LocalEntityCfg(localId, IndicationCfg(), fhMock);
   auto fsMock = FilesystemMock();
   auto userMock = UserMock(fsMock);
   auto remoteCfgTableMock = RemoteConfigTableMock();
-  // auto destHandler = DestHandler(localEntityCfg, userMock, remoteCfgTableMock);
+  PacketInfoList<64> packetInfoList;
+  LostSegmentsList<128> lostSegmentsList;
+  DestHandlerParams dp(localEntityCfg, userMock, remoteCfgTableMock, packetInfoList,
+                       lostSegmentsList);
+  // FsfwParams fp(destQueueId, mqMock);
+  // auto destHandler = DestHandler();
 
   SECTION("State") {}
 }
\ No newline at end of file