Node: add buildReportRssiTopic method

Common code for all node types, so just implement it in parent class.
gokvik · Sep 24, 2024 · c98729c · c98729c
1 parent 86dd78c
commit c98729c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/include/kvik/node.hpp b/include/kvik/node.hpp
@@ -196,5 +196,12 @@ namespace kvik
         bool validateMsgTimestamp(
             uint16_t ts,
             std::chrono::milliseconds tsDiff = std::chrono::milliseconds(0));
+
+        /**
+         * @brief Builds RSSI report topic
+         * @param addr Peer address
+         * @return RSSI report topic
+         */
+        std::string buildReportRssiTopic(const LocalAddr &peer) const;
     };
 } // namespace kvik
diff --git a/src/common/node.cpp b/src/common/node.cpp
@@ -67,4 +67,13 @@ namespace kvik
         return msgTsUnits <= nowUnits &&
                msgTsUnits >= nowUnits - maxDriftUnits;
     }
+
+    std::string INode::buildReportRssiTopic(const LocalAddr &peer) const
+    {
+        return m_nodeConf.reporting.baseTopic +
+               m_nodeConf.topicSep.levelSeparator +
+               m_nodeConf.reporting.rssiSubtopic +
+               m_nodeConf.topicSep.levelSeparator +
+               peer.toString();
+    }
 } // namespace kvik
diff --git a/test/include/kvik_testing/dummy_node.hpp b/test/include/kvik_testing/dummy_node.hpp
@@ -38,6 +38,7 @@ namespace kvik
         using INode::INode;
         using INode::validateMsgId;
         using INode::validateMsgTimestamp;
+        using INode::buildReportRssiTopic;
 
         ErrCode pubSubUnsubBulk(const std::vector<PubData> &newPubs,
                                 const std::vector<SubReq> &newSubs,

diff --git a/test/tests/node.cpp b/test/tests/node.cpp
@@ -216,3 +216,19 @@ TEST_CASE("Validate message timestamp", "[Node]")
         CHECK_FALSE(node.validateMsgTimestamp(msgTsNow - 2, tsDiff));
     }
 }
+
+TEST_CASE("Build RSSI report topic", "[Node]")
+{
+    auto conf = DEFAULT_CONFIG;
+    conf.reporting.baseTopic = "REPORT";
+    conf.reporting.rssiSubtopic = "RSSI";
+    conf.topicSep.levelSeparator = "..";
+
+    LocalAddr peer;
+    peer.addr = {1, 2, 3};
+
+    DummyNode node(conf);
+
+    CHECK(node.buildReportRssiTopic(peer) ==
+          "REPORT..RSSI.." + peer.toString());
+}