some more ref replacements

src/fsfw/pus/Service17Test.cpp

@@ -42,11 +42,11 @@ ReturnValue_t Service17Test::initialize() {
     if (tmStore == nullptr) {
       return ObjectManagerIF::CHILD_INIT_FAILED;
     }
-    storeHelper.setTmStore(tmStore);
+    storeHelper.setTmStore(*tmStore);
   }
   return result;
 }
 
-void Service17Test::setCustomTmStore(StorageManagerIF* tmStore_) {
+void Service17Test::setCustomTmStore(StorageManagerIF& tmStore_) {
   storeHelper.setTmStore(tmStore_);
 }

src/fsfw/pus/Service17Test.h

@@ -35,7 +35,7 @@ class Service17Test : public PusServiceBase {
 
   Service17Test(object_id_t objectId, uint16_t apid, uint8_t serviceId);
 
-  void setCustomTmStore(StorageManagerIF* tmStore);
+  void setCustomTmStore(StorageManagerIF& tmStore);
 
   ~Service17Test() override;
   ReturnValue_t handleRequest(uint8_t subservice) override;

src/fsfw/pus/Service1TelecommandVerification.cpp

@@ -100,7 +100,7 @@ ReturnValue_t Service1TelecommandVerification::initialize() {
     if (tmStore == nullptr) {
       return ObjectManager::CHILD_INIT_FAILED;
     }
-    storeHelper.setTmStore(tmStore);
+    storeHelper.setTmStore(*tmStore);
   }
   return SystemObject::initialize();
 }

src/fsfw/tmtcservices/CommandingServiceBase.cpp

@@ -96,7 +96,7 @@ ReturnValue_t CommandingServiceBase::initialize() {
     if (tmStore == nullptr) {
       return ObjectManagerIF::CHILD_INIT_FAILED;
     }
-    tmStoreHelper.setTmStore(tmStore);
+    tmStoreHelper.setTmStore(*tmStore);
   }
   if (errReporter == nullptr) {
     errReporter =
@@ -419,7 +419,7 @@ void CommandingServiceBase::checkTimeout() {
 
 void CommandingServiceBase::setTaskIF(PeriodicTaskIF* task_) { executingTask = task_; }
 
-void CommandingServiceBase::setCustomTmStore(StorageManagerIF* store) {
+void CommandingServiceBase::setCustomTmStore(StorageManagerIF& store) {
   tmStoreHelper.setTmStore(store);
 }
 ReturnValue_t CommandingServiceBase::setUpTcReader(store_address_t storeId) {

src/fsfw/tmtcservices/CommandingServiceBase.h

@@ -70,7 +70,7 @@ class CommandingServiceBase : public SystemObject,
                         size_t queueDepth = 20);
   ~CommandingServiceBase() override;
 
-  void setCustomTmStore(StorageManagerIF* store);
+  void setCustomTmStore(StorageManagerIF& store);
   /**
    * This setter can be used to set the packet source individually instead
    * of using the default static framework ID set in the factory.

src/fsfw/tmtcservices/TmStoreHelper.cpp

@@ -28,16 +28,18 @@ ReturnValue_t TmStoreHelper::preparePacket(uint8_t service, uint8_t subservice,
 
 StorageManagerIF* TmStoreHelper::getTmStore() { return tmStore; }
 
-void TmStoreHelper::setTmStore(StorageManagerIF* store) { tmStore = store; }
+void TmStoreHelper::setTmStore(StorageManagerIF& store) { tmStore = &store; }
+
 const store_address_t& TmStoreHelper::getCurrentAddr() const { return currentAddr; }
+
 ReturnValue_t TmStoreHelper::deletePacket() { return tmStore->deleteData(currentAddr); }
 
-void TmStoreHelper::setSourceDataRaw(const uint8_t* data, size_t len) {
-  creator.setRawUserData(data, len);
+ReturnValue_t TmStoreHelper::setSourceDataRaw(const uint8_t* data, size_t len) {
+  return creator.setRawUserData(data, len);
 }
 
-void TmStoreHelper::setSourceDataSerializable(SerializeIF* serializable) {
-  creator.setSerializableUserData(serializable);
+ReturnValue_t TmStoreHelper::setSourceDataSerializable(SerializeIF* serializable) {
+  return creator.setSerializableUserData(serializable);
 }
 
 ReturnValue_t TmStoreHelper::addPacketToStore() {

src/fsfw/tmtcservices/TmStoreHelper.h

@@ -18,11 +18,11 @@ class TmStoreHelper {
   PusTmCreator& getCreatorRef();
   void setTimeStamper(TimeStamperIF& timeStamper);
   [[nodiscard]] const store_address_t& getCurrentAddr() const;
-  void setSourceDataRaw(const uint8_t* data, size_t len);
-  void setSourceDataSerializable(SerializeIF* serializable);
+  ReturnValue_t setSourceDataRaw(const uint8_t* data, size_t len);
+  ReturnValue_t setSourceDataSerializable(SerializeIF* serializable);
   void setApid(uint16_t apid);
   StorageManagerIF* getTmStore();
-  void setTmStore(StorageManagerIF* store);
+  void setTmStore(StorageManagerIF& store);
   ReturnValue_t addPacketToStore();
   ReturnValue_t deletePacket();
 

unittests/tmtcservices/testStoreHelper.cpp

@@ -12,6 +12,7 @@ TEST_CASE("TM Store Helper", "[tm-store-helper]") {
 
   SECTION("State") {
     REQUIRE(storeHelper.getCurrentAddr() == store_address_t::invalid());
+    REQUIRE(storeHelper.getTmStore() == &pool);
     REQUIRE(storeHelper.preparePacket(17, 1, 1) == HasReturnvaluesIF::RETURN_OK);
     auto& creator = storeHelper.getCreatorRef();
     REQUIRE(creator.getApid() == 2);
@@ -25,5 +26,9 @@ TEST_CASE("TM Store Helper", "[tm-store-helper]") {
     REQUIRE(storeHelper.preparePacket(17, 1, 1) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(storeHelper.addPacketToStore() == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(storeHelper.getCurrentAddr() != store_address_t::invalid());
+    auto accessor = pool.getData(storeHelper.getCurrentAddr());
+    REQUIRE(accessor.first == HasReturnvaluesIF::RETURN_OK);
+    // Not going to verify individual fields, the creator was unittested separately
+    REQUIRE(accessor.second.size() == 22);
   }
 }