Make format

llarp/dht/context.cpp

@@ -539,8 +539,7 @@ namespace llarp
     void
     Context::LookupIntroSetForPath(const Key_t& addr, uint64_t txid,
                                    const llarp::PathID_t& path,
-                                   const Key_t& askpeer,
+                                   const Key_t& askpeer, uint64_t relayOrder)
-                                   uint64_t relayOrder)
     {
       TXOwner asker(OurKey(), txid);
       TXOwner peer(askpeer, ++ids);

llarp/dht/context.hpp

@@ -44,19 +44,18 @@ namespace llarp
 
       /// Ask a Service Node to perform an Introset lookup for us
       virtual void
-      LookupIntroSetRelayed(
+      LookupIntroSetRelayed(const Key_t& target, const Key_t& whoasked,
-          const Key_t& target, const Key_t& whoasked, uint64_t whoaskedTX,
+                            uint64_t whoaskedTX, const Key_t& askpeer,
-          const Key_t& askpeer, uint64_t relayOrder,
+                            uint64_t relayOrder,
-          service::EncryptedIntroSetLookupHandler result =
+                            service::EncryptedIntroSetLookupHandler result =
-              service::EncryptedIntroSetLookupHandler()) = 0;
+                                service::EncryptedIntroSetLookupHandler()) = 0;
 
       /// Directly as a Service Node for an Introset
       virtual void
-      LookupIntroSetDirect(
+      LookupIntroSetDirect(const Key_t& target, const Key_t& whoasked,
-          const Key_t& target, const Key_t& whoasked, uint64_t whoaskedTX,
+                           uint64_t whoaskedTX, const Key_t& askpeer,
-          const Key_t& askpeer,
+                           service::EncryptedIntroSetLookupHandler result =
-          service::EncryptedIntroSetLookupHandler result =
+                               service::EncryptedIntroSetLookupHandler()) = 0;
-              service::EncryptedIntroSetLookupHandler()) = 0;
 
       virtual bool
       HasRouterLookup(const RouterID& target) const = 0;

llarp/dht/messages/findintro.cpp

@@ -9,7 +9,7 @@ namespace llarp
 {
   namespace dht
   {
-    FindIntroMessage::~FindIntroMessage()              = default;
+    FindIntroMessage::~FindIntroMessage() = default;
 
     bool
     FindIntroMessage::DecodeKey(const llarp_buffer_t& k, llarp_buffer_t* val)

llarp/dht/messages/findintro.hpp

@@ -32,10 +32,7 @@ namespace llarp
 
       explicit FindIntroMessage(uint64_t txid, const Key_t& addr,
                                 uint64_t order)
-          : IMessage({})
+          : IMessage({}), location(addr), txID(txid), relayOrder(order)
-          , location(addr)
-          , txID(txid)
-          , relayOrder(order)
       {
         tagName.Zero();
       }

llarp/dht/serviceaddresslookup.cpp

@@ -52,9 +52,8 @@ namespace llarp
     void
     ServiceAddressLookup::Start(const TXOwner &peer)
     {
-      parent->DHTSendTo(
+      parent->DHTSendTo(peer.node.as_array(),
-          peer.node.as_array(),
+                        new FindIntroMessage(peer.txid, target, relayOrder));
-          new FindIntroMessage(peer.txid, target, relayOrder));
     }
 
     void

llarp/dht/taglookup.cpp

@@ -28,9 +28,8 @@ namespace llarp
     void
     TagLookup::Start(const TXOwner &peer)
     {
-      parent->DHTSendTo(
+      parent->DHTSendTo(peer.node.as_array(),
-          peer.node.as_array(),
+                        new FindIntroMessage(target, peer.txid));
-          new FindIntroMessage(target, peer.txid));
     }
 
     void