Rename bencode function for clarity

llarp/dht/messages/findintro.cpp

@@ -26,7 +26,7 @@ namespace llarp
       if(!BEncodeMaybeReadDictInt("T", T, read, k, val))
         return false;
 
-      if(!BEncodeMaybeReadVersion("V", version, LLARP_PROTO_VERSION, read, k,
+      if(!BEncodeMaybeVerifyVersion("V", version, LLARP_PROTO_VERSION, read, k,
                                   val))
         return false;
 

llarp/dht/messages/gotrouter.cpp

@@ -71,7 +71,7 @@ namespace llarp
         return bencode_read_integer(val, &txid);
       }
       bool read = false;
-      if(!BEncodeMaybeReadVersion("V", version, LLARP_PROTO_VERSION, read, key,
+      if(!BEncodeMaybeVerifyVersion("V", version, LLARP_PROTO_VERSION, read, key,
                                   val))
         return false;
 

llarp/messages/relay.cpp

@@ -41,7 +41,7 @@ namespace llarp
     bool read = false;
     if(!BEncodeMaybeReadDictEntry("p", pathid, read, key, buf))
       return false;
-    if(!BEncodeMaybeReadVersion("v", version, LLARP_PROTO_VERSION, read, key,
+    if(!BEncodeMaybeVerifyVersion("v", version, LLARP_PROTO_VERSION, read, key,
                                 buf))
       return false;
     if(!BEncodeMaybeReadDictEntry("x", X, read, key, buf))
@@ -97,7 +97,7 @@ namespace llarp
     bool read = false;
     if(!BEncodeMaybeReadDictEntry("p", pathid, read, key, buf))
       return false;
-    if(!BEncodeMaybeReadVersion("v", version, LLARP_PROTO_VERSION, read, key,
+    if(!BEncodeMaybeVerifyVersion("v", version, LLARP_PROTO_VERSION, read, key,
                                 buf))
       return false;
     if(!BEncodeMaybeReadDictEntry("x", X, read, key, buf))

llarp/messages/relay_commit.cpp

@@ -26,7 +26,7 @@ namespace llarp
       return BEncodeReadArray(frames, buf);
     }
     bool read = false;
-    if(!BEncodeMaybeReadVersion("v", version, LLARP_PROTO_VERSION, read, key,
+    if(!BEncodeMaybeVerifyVersion("v", version, LLARP_PROTO_VERSION, read, key,
                                 buf))
       return false;
 
@@ -134,7 +134,7 @@ namespace llarp
       nextRC = std::make_unique< RouterContact >();
       return nextRC->BDecode(buffer);
     }
-    if(!BEncodeMaybeReadVersion("v", version, LLARP_PROTO_VERSION, read, *key,
+    if(!BEncodeMaybeVerifyVersion("v", version, LLARP_PROTO_VERSION, read, *key,
                                 buffer))
       return false;
     if(*key == "w")

llarp/messages/relay_status.cpp

@@ -76,7 +76,7 @@ namespace llarp
     }
     else if(key == "v")
     {
-      if(!BEncodeMaybeReadVersion("v", version, LLARP_PROTO_VERSION, read, key,
+      if(!BEncodeMaybeVerifyVersion("v", version, LLARP_PROTO_VERSION, read, key,
                                   buf))
       {
         return false;
@@ -262,7 +262,7 @@ namespace llarp
 
     if(!BEncodeMaybeReadDictInt("s", status, read, *key, buffer))
       return false;
-    if(!BEncodeMaybeReadVersion("v", version, LLARP_PROTO_VERSION, read, *key,
+    if(!BEncodeMaybeVerifyVersion("v", version, LLARP_PROTO_VERSION, read, *key,
                                 buffer))
       return false;
 

llarp/service/protocol.cpp

@@ -163,7 +163,7 @@ namespace llarp
         return false;
       if(!BEncodeMaybeReadDictEntry("T", T, read, key, val))
         return false;
-      if(!BEncodeMaybeReadVersion("V", version, LLARP_PROTO_VERSION, read, key,
+      if(!BEncodeMaybeVerifyVersion("V", version, LLARP_PROTO_VERSION, read, key,
                                   val))
         return false;
       if(!BEncodeMaybeReadDictEntry("Z", Z, read, key, val))

llarp/util/bencode.hpp

@@ -99,9 +99,11 @@ namespace llarp
     return true;
   }
 
+  /// If the key matches, reads in the version and ensures that it equals the
+  /// expected version
   template < typename Item_t >
   bool
-  BEncodeMaybeReadVersion(const char* k, Item_t& item, uint64_t expect,
+  BEncodeMaybeVerifyVersion(const char* k, Item_t& item, uint64_t expect,
                           bool& read, const llarp_buffer_t& key,
                           llarp_buffer_t* buf)
   {