refactor(minhton): Use SolaNet SERIALIZE macro

Fixes #6
iml130 · Oct 12, 2023 · 4f13236 · 4f13236
1 parent 8007aa7
commit 4f13236
Show file tree

Hide file tree

Showing 44 changed files with 50 additions and 66 deletions.
diff --git a/daisi/src/minhton-ns3/adapter/algorithms/CMakeLists.txt b/daisi/src/minhton-ns3/adapter/algorithms/CMakeLists.txt
@@ -28,16 +28,16 @@ target_sources(minhton_algorithms_sim
     ${MINHTON_SOURCE_DIR}/src/algorithms/esearch/minhton_entity_search_algorithm_helper.cpp
 )
 
-target_include_directories(minhton_algorithms_sim 
+target_include_directories(minhton_algorithms_sim
     PUBLIC
         ${MINHTON_SOURCE_DIR}/include
 )
-target_link_libraries(minhton_algorithms_sim 
+target_link_libraries(minhton_algorithms_sim
   PUBLIC
     minhton_core_physical_node_info
     minhton_core_node_info_sim
     minhton_core_routing_table_sim
-    minhton_message_serialize
+    solanet_serialize
     minhton_message_sim
     minhton_core_definitions
     minhton_core_access_container_sim

diff --git a/daisi/src/minhton-ns3/adapter/core/CMakeLists.txt b/daisi/src/minhton-ns3/adapter/core/CMakeLists.txt
@@ -88,7 +88,7 @@ target_link_libraries(minhton_core_node_info_sim
   PUBLIC
     minhton_core_physical_node_info
     minhton_core_logical_node_info_sim
-    minhton_message_serialize
+    solanet_serialize
 )
 
 # Logical node info
@@ -99,7 +99,7 @@ target_include_directories(minhton_core_logical_node_info_sim
 )
 target_link_libraries(minhton_core_logical_node_info_sim
   PUBLIC
-    minhton_message_serialize
+    solanet_serialize
     solanet_uuid
     solanet_uuid_generator_sim
   PRIVATE

diff --git a/daisi/src/minhton-ns3/adapter/message/CMakeLists.txt b/daisi/src/minhton-ns3/adapter/message/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(minhton_message_sim
     minhton_algorithms_sim # For esearch/NodeData/FindQuery
     minhton_core_node_info_sim
     minhton_core_constants
-    minhton_message_serialize
+    solanet_serialize
   PRIVATE
     minhton_exception_algorithm
     minhton_core_routing_calculations

diff --git a/docs/minhton/programmers/messages.md b/docs/minhton/programmers/messages.md
@@ -16,7 +16,7 @@ What needs to be done for adding a new message type:
 
 - Create a new header file in `include/minhton/message` (Tip: Use join.h as a guideline)
     - Make sure to use a unique name for the ifndef include guide
-    - Make sure to include `#include "minhton/message/message.h"` and `#include "minhton/message/serialize.h"`
+    - Make sure to include `#include "minhton/message/message.h"` and `#include "solanet/serializer/serialize.h"`
     - Place a `SERIALIZE(...)` with required attributes under public visibility (Tip: Look at `include/minhton/algorithms/esearch/find_query.h` if the message type needs separate load and save functions)
     - Apart from the constructor for general usage which should have all parameters to create a valid message, a default constructor is required for serialization purposes.
     - Always required and the same are the `protected` fields that all message types must have.

diff --git a/minhton/include/minhton/algorithms/esearch/find_query.h b/minhton/include/minhton/algorithms/esearch/find_query.h
@@ -15,7 +15,7 @@
 #include "minhton/algorithms/esearch/local_data.h"
 #include "minhton/algorithms/esearch/node_data.h"
 #include "minhton/core/node_info.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 class FindQuery {

diff --git a/minhton/include/minhton/algorithms/esearch/node_data.h b/minhton/include/minhton/algorithms/esearch/node_data.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "minhton/core/node_info.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 

diff --git a/minhton/include/minhton/core/logical_node_info.h b/minhton/include/minhton/core/logical_node_info.h
@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 #include "solanet/uuid.h"
 #include "solanet/uuid_generator.h"
 

diff --git a/minhton/include/minhton/core/node_info.h b/minhton/include/minhton/core/node_info.h
@@ -11,7 +11,7 @@
 
 #include "minhton/core/logical_node_info.h"
 #include "minhton/core/physical_node_info.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 

diff --git a/minhton/include/minhton/core/physical_node_info.h b/minhton/include/minhton/core/physical_node_info.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 #define PORT_MIN 1024

diff --git a/minhton/include/minhton/message/attribute_inquiry_answer.h b/minhton/include/minhton/message/attribute_inquiry_answer.h
@@ -11,7 +11,7 @@
 
 #include "minhton/algorithms/esearch/node_data.h"
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** The message that the node which received a MessageAttributeInquiryRequest

diff --git a/minhton/include/minhton/message/attribute_inquiry_request.h b/minhton/include/minhton/message/attribute_inquiry_request.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A node that is not a DSN may receive a MessageAttributeInquiryRequest during

diff --git a/minhton/include/minhton/message/bootstrap_discover.h b/minhton/include/minhton/message/bootstrap_discover.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_BOOTSTRAP_DISCOVER_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A node wants to join the network but does not have access to a node's

diff --git a/minhton/include/minhton/message/bootstrap_response.h b/minhton/include/minhton/message/bootstrap_response.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_BOOTSTRAP_RESPONSE_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** After receiving a MessageBootstrapDiscover, the node receiving the message

diff --git a/minhton/include/minhton/message/empty.h b/minhton/include/minhton/message/empty.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_EMPTY_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A helper message type for the Search Exact Test. It has no functionality by

diff --git a/minhton/include/minhton/message/find_query_answer.h b/minhton/include/minhton/message/find_query_answer.h
@@ -13,7 +13,7 @@
 #include "minhton/algorithms/esearch/node_data.h"
 #include "minhton/core/node_info.h"
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A DSN sends a MessageFindQueryAnswer back to the requesting node (that sent

diff --git a/minhton/include/minhton/message/find_query_request.h b/minhton/include/minhton/message/find_query_request.h
@@ -11,7 +11,7 @@
 
 #include "minhton/algorithms/esearch/find_query.h"
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A node that wants to find data in the network can call the Entity Search

diff --git a/minhton/include/minhton/message/find_replacement.h b/minhton/include/minhton/message/find_replacement.h
@@ -9,7 +9,7 @@
 
 #include "minhton/message/find_end.h"
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A node wants to leave the network, but cannot leave the position directly

diff --git a/minhton/include/minhton/message/get_neighbors.h b/minhton/include/minhton/message/get_neighbors.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_GET_NEIGHBORS_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** Currently only used in the join accept procedure in rare cases by the parent

diff --git a/minhton/include/minhton/message/inform_about_neighbors.h b/minhton/include/minhton/message/inform_about_neighbors.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_INFORM_ABOUT_NEIGHBORS_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** This message is an answer to a MessageGetNeighbors. It contains the node

diff --git a/minhton/include/minhton/message/join.h b/minhton/include/minhton/message/join.h
@@ -9,7 +9,7 @@
 
 #include "minhton/message/find_end.h"
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** When a node wants to join the network, it sends a MessageJoin to one node in

diff --git a/minhton/include/minhton/message/join_accept.h b/minhton/include/minhton/message/join_accept.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_JOIN_ACCEPT_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A fitting join position has been found by forwarding the MessageJoin

diff --git a/minhton/include/minhton/message/join_accept_ack.h b/minhton/include/minhton/message/join_accept_ack.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_JOIN_ACCEPT_ACK_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** After receiving a MessageJoinAccept, the new child must send a

diff --git a/minhton/include/minhton/message/lock_neighbor_request.h b/minhton/include/minhton/message/lock_neighbor_request.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_LOCK_NEIGHBOR_REQUEST_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** The parent of a successor node sends a Lock Neighbor Request to its right

diff --git a/minhton/include/minhton/message/lock_neighbor_response.h b/minhton/include/minhton/message/lock_neighbor_response.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_LOCK_NEIGHBOR_RESPONSE_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** The answer to a MessageLockNeighborRequest, received by the parent of a

diff --git a/minhton/include/minhton/message/message_header.h b/minhton/include/minhton/message/message_header.h
@@ -13,8 +13,8 @@
 #include "minhton/core/constants.h"
 #include "minhton/core/node_info.h"
 #include "minhton/message/message_logging.h"
-#include "minhton/message/serialize.h"
 #include "minhton/message/types.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 ///

diff --git a/minhton/include/minhton/message/remove_and_update_neighbor.h b/minhton/include/minhton/message/remove_and_update_neighbor.h
@@ -9,8 +9,8 @@
 
 #include "minhton/message/message.h"
 #include "minhton/message/remove_neighbor.h"
-#include "minhton/message/serialize.h"
 #include "minhton/message/update_neighbors.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** Used in the leave and response algorithms for updating the routing

diff --git a/minhton/include/minhton/message/remove_neighbor.h b/minhton/include/minhton/message/remove_neighbor.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_REMOVE_NEIGHBOR_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A node is leaving the network. This is a notification to remove the given

diff --git a/minhton/include/minhton/message/remove_neighbor_ack.h b/minhton/include/minhton/message/remove_neighbor_ack.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_REMOVE_NEIGHBOR_ACK_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** Is sent as a reply to either a MessageReplacementUpdate or

diff --git a/minhton/include/minhton/message/replacement_ack.h b/minhton/include/minhton/message/replacement_ack.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_REPLACEMENT_ACK_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** The node that wants to leave the network receives a MessageReplacementOffer

diff --git a/minhton/include/minhton/message/replacement_nack.h b/minhton/include/minhton/message/replacement_nack.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_REPLACEMENT_NACK_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A MessageReplacementNack is sent back to the node to replace in case of a

diff --git a/minhton/include/minhton/message/replacement_offer.h b/minhton/include/minhton/message/replacement_offer.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_REPLACEMENT_OFFER_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A MessageFindReplacement reached a node that can replace the leaving node.

diff --git a/minhton/include/minhton/message/replacement_update.h b/minhton/include/minhton/message/replacement_update.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_REPLACEMENT_UPDATE_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** During the replacement process, the neighbor nodes of the leaving node / the

diff --git a/minhton/include/minhton/message/search_exact.h b/minhton/include/minhton/message/search_exact.h
@@ -9,7 +9,7 @@
 
 #include "minhton/message/message.h"
 #include "minhton/message/se_types.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A node wants to send a message to another node in the network, but does not

diff --git a/minhton/include/minhton/message/search_exact_failure.h b/minhton/include/minhton/message/search_exact_failure.h
@@ -9,7 +9,7 @@
 
 #include "minhton/message/message.h"
 #include "minhton/message/se_types.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** If a node cannot further forward a MessageSearchExact, but is also not the

diff --git a/minhton/include/minhton/message/serialize.h b/minhton/include/minhton/message/serialize.h
diff --git a/minhton/include/minhton/message/signoff_parent_answer.h b/minhton/include/minhton/message/signoff_parent_answer.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_SIGNOFF_PARENT_ANSWER_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** The successor node waits for the MessageSignoffParentAnswer from its parent

diff --git a/minhton/include/minhton/message/signoff_parent_request.h b/minhton/include/minhton/message/signoff_parent_request.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_SIGNOFF_PARENT_REQUEST_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** The last node of the network, the chosen successor, sends a

diff --git a/minhton/include/minhton/message/subscription_order.h b/minhton/include/minhton/message/subscription_order.h
@@ -9,7 +9,7 @@
 
 #include "minhton/algorithms/esearch/node_data.h"
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** A node can send a MessageSubscriptionOrder to subscribe or unsubscribe

diff --git a/minhton/include/minhton/message/subscription_update.h b/minhton/include/minhton/message/subscription_update.h
@@ -9,7 +9,7 @@
 
 #include "minhton/algorithms/esearch/node_data.h"
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** If a node's local data is modified (inserted, updated or removed), it will

diff --git a/minhton/include/minhton/message/unlock_neighbor.h b/minhton/include/minhton/message/unlock_neighbor.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_UNLOCK_NEIGHBOR_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 namespace minhton {
 /// @brief * **Usage:** Used for unlocking nodes after they were locked during a concurrent

diff --git a/minhton/include/minhton/message/update_neighbors.h b/minhton/include/minhton/message/update_neighbors.h
@@ -8,7 +8,7 @@
 #define MINHTON_MESSAGE_UPDATE_NEIGHBORS_H_
 
 #include "minhton/message/message.h"
-#include "minhton/message/serialize.h"
+#include "solanet/serializer/serialize.h"
 
 using NeighborsAndRelationships =
     std::vector<std::tuple<minhton::NodeInfo, minhton::NeighborRelationship>>;