Simplify mDNS config component

Author: dshil

components/ocs_pipeline/config/mdns_config.cpp

@@ -24,13 +24,10 @@ const char* log_tag = "mdns_config";
 
 } // namespace
 
-MdnsConfig::MdnsConfig(const system::DeviceInfo& device_info,
-                       storage::StorageBuilder& storage_builder) {
-    storage_ = storage_builder.make("mdns_config");
-    configASSERT(storage_);
-
+MdnsConfig::MdnsConfig(storage::IStorage& storage, const system::DeviceInfo& device_info)
+    : storage_(storage) {
     memset(hostname_, 0, sizeof(hostname_));
-    auto code = algo::StorageOps::prob_read(*storage_, hostname_key_, hostname_,
+    auto code = algo::StorageOps::prob_read(storage_, hostname_key_, hostname_,
                                             max_hostname_size_);
     if (code != status::StatusCode::OK) {
         memcpy(hostname_, device_info.get_fw_name(),
@@ -50,7 +47,7 @@ status::StatusCode MdnsConfig::configure(const char* hostname) {
     bool modified = false;
 
     if (strncmp(hostname_, hostname, std::min(strlen(hostname_), strlen(hostname)))) {
-        const auto code = storage_->write(hostname_key_, hostname, strlen(hostname));
+        const auto code = storage_.write(hostname_key_, hostname, strlen(hostname));
         if (code != status::StatusCode::OK) {
             return code;
         }
@@ -68,7 +65,7 @@ status::StatusCode MdnsConfig::configure(const char* hostname) {
 }
 
 status::StatusCode MdnsConfig::reset() {
-    auto code = storage_->erase(hostname_key_);
+    auto code = storage_.erase(hostname_key_);
     if (code == status::StatusCode::NoData) {
         code = status::StatusCode::NotModified;
     }

components/ocs_pipeline/config/mdns_config.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "ocs_core/noncopyable.h"
-#include "ocs_storage/storage_builder.h"
+#include "ocs_storage/istorage.h"
 #include "ocs_system/device_info.h"
 
 namespace ocs {
@@ -21,10 +21,9 @@ class MdnsConfig : public core::NonCopyable<> {
     //! Initialize.
     //!
     //! @params
+    //!  - @p storage to persist mDNS configuration.
     //!  - @p device_info to use as a fallback for mDNS configuration.
-    //!  - @p storage_builder to persist mDNS configuration.
-    MdnsConfig(const system::DeviceInfo& device_info,
-               storage::StorageBuilder& storage_builder);
+    MdnsConfig(storage::IStorage& storage, const system::DeviceInfo& device_info);
 
     //! Return the configured mDNS hostname.
     const char* get_hostname() const;
@@ -37,10 +36,9 @@ class MdnsConfig : public core::NonCopyable<> {
 
 private:
     static constexpr const char* hostname_key_ = "host";
-
     static constexpr unsigned max_hostname_size_ = 31;
 
-    storage::StorageBuilder::IStoragePtr storage_;
+    storage::IStorage& storage_;
 
     char hostname_[max_hostname_size_ + 1];
 };