Merge pull request #9659

d64d3bd p2p: remove dead protocol defs (jeffro256)
monero-project · Jan 14, 2025 · 90e908f · 90e908f
2 parents 06f0cd5 + d64d3bd
commit 90e908f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 34 deletions.
diff --git a/src/debug_utilities/object_sizes.cpp b/src/debug_utilities/object_sizes.cpp
@@ -94,8 +94,6 @@ int main(int argc, char* argv[])
   SL(nodetool::anchor_peerlist_entry);
   SL(nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core>>);
   SL(nodetool::p2p_connection_context_t<cryptonote::t_cryptonote_protocol_handler<cryptonote::core>::connection_context>);
-  SL(nodetool::network_address_old);
-  SL(nodetool::peerlist_entry_base<nodetool::network_address_old>);
 
   SL(nodetool::network_config);
   SL(nodetool::basic_node_data);

diff --git a/src/p2p/p2p_protocol_defs.h b/src/p2p/p2p_protocol_defs.h
@@ -57,17 +57,6 @@ namespace nodetool
 
 #pragma pack (push, 1)
 
-  struct network_address_old
-  {
-    uint32_t ip;
-    uint32_t port;
-
-    BEGIN_KV_SERIALIZE_MAP()
-      KV_SERIALIZE(ip)
-      KV_SERIALIZE(port)
-    END_KV_SERIALIZE_MAP()
-  };
-
   template<typename AddressType>
   struct peerlist_entry_base
   {
@@ -119,27 +108,6 @@ namespace nodetool
   };
   typedef anchor_peerlist_entry_base<epee::net_utils::network_address> anchor_peerlist_entry;
 
-  template<typename AddressType>
-  struct connection_entry_base
-  {
-    AddressType adr;
-    peerid_type id;
-    bool is_income;
-
-    BEGIN_KV_SERIALIZE_MAP()
-      KV_SERIALIZE(adr)
-      KV_SERIALIZE(id)
-      KV_SERIALIZE(is_income)
-    END_KV_SERIALIZE_MAP()
-
-    BEGIN_SERIALIZE()
-      FIELD(adr)
-      FIELD(id)
-      FIELD(is_income)
-    END_SERIALIZE()
-  };
-  typedef connection_entry_base<epee::net_utils::network_address> connection_entry;
-
 #pragma pack(pop)
 
   inline