Remove router nickname

I don't think Kee needs it anymore.

llarp/config/config.cpp

@@ -110,7 +110,7 @@ namespace llarp
           m_maxConnectedRouters = arg;
         });
 
-    conf.defineOption<std::string>("router", "nickname", Hidden, AssignmentAcceptor(m_nickname));
+    conf.defineOption<std::string>("router", "nickname", Deprecated);
 
     conf.defineOption<fs::path>(
         "router",

llarp/config/config.hpp

@@ -61,7 +61,6 @@ namespace llarp
     size_t m_maxConnectedRouters = 0;
 
     std::string m_netId;
-    std::string m_nickname;
 
     fs::path m_dataDir;
 

llarp/router/router.cpp

@@ -635,7 +635,6 @@ namespace llarp
     }
 
     // Router config
-    router_contact.SetNick(conf.router.m_nickname);
     _link_manager.max_connected_routers = conf.router.m_maxConnectedRouters;
     _link_manager.min_connected_routers = conf.router.m_minConnectedRouters;
 

llarp/router_contact.cpp

@@ -153,11 +153,6 @@ namespace llarp
     btdp.append("a", addr.to_string());
     btdp.append("i", netID.ToView());
     btdp.append("k", pubkey.bt_encode());
-
-    auto n = Nick();
-    if (not n.empty())
-      btdp.append("n", n);
-
     btdp.append("p", enckey.ToView());
     btdp.append("r", routerVersion);
 
@@ -178,7 +173,6 @@ namespace llarp
   RouterContact::Clear()
   {
     signature.Zero();
-    nickname.Zero();
     enckey.Zero();
     pubkey.Zero();
     routerVersion = std::optional<RouterVersion>{};
@@ -196,10 +190,6 @@ namespace llarp
         {"identity", pubkey.ToString()},
         {"address", addr.to_string()}};
 
-    if (HasNick())
-    {
-      obj["nickname"] = Nick();
-    }
     if (routerVersion)
     {
       obj["routerVersion"] = routerVersion->ToString();
@@ -308,22 +298,6 @@ namespace llarp
       return true;
     }
 
-    if (key.startswith("n"))
-    {
-      llarp_buffer_t strbuf;
-      if (!bencode_read_string(buf, &strbuf))
-      {
-        return false;
-      }
-      if (strbuf.sz > llarp::AlignedBuffer<(32)>::size())
-      {
-        return false;
-      }
-      nickname.Zero();
-      std::copy(strbuf.base, strbuf.base + strbuf.sz, nickname.begin());
-      return true;
-    }
-
     if (not BEncodeMaybeReadDictList("s", srvRecords, read, key, buf))
       return false;
 
@@ -355,20 +329,6 @@ namespace llarp
     return addr.is_addressable();
   }
 
-  bool
-  RouterContact::HasNick() const
-  {
-    return nickname[0] != 0;
-  }
-
-  void
-  RouterContact::SetNick(std::string_view nick)
-  {
-    nickname.Zero();
-    std::copy(
-        nick.begin(), nick.begin() + std::min(nick.size(), nickname.size()), nickname.begin());
-  }
-
   bool
   RouterContact::IsExpired(llarp_time_t now) const
   {
@@ -394,13 +354,6 @@ namespace llarp
     return TimeUntilExpires(now) <= dlt;
   }
 
-  std::string
-  RouterContact::Nick() const
-  {
-    auto term = std::find(nickname.begin(), nickname.end(), '\0');
-    return std::string(nickname.begin(), term);
-  }
-
   bool
   RouterContact::Sign(const SecretKey& secretkey)
   {

llarp/router_contact.hpp

@@ -18,7 +18,6 @@
 #include <vector>
 
 #define MAX_RC_SIZE (1024)
-#define NICKLEN (32)
 
 namespace oxenc
 {
@@ -87,8 +86,6 @@ namespace llarp
     llarp::PubKey pubkey;
     // signature
     llarp::Signature signature;
-    /// node nickname, yw kee
-    llarp::AlignedBuffer<NICKLEN> nickname;
 
     llarp_time_t last_updated = 0s;
     uint64_t version = llarp::constants::proto_version;
@@ -134,7 +131,7 @@ namespace llarp
     operator==(const RouterContact& other) const
     {
       return addr == other.addr && enckey == other.enckey && pubkey == other.pubkey
-          && signature == other.signature && nickname == other.nickname
+          && signature == other.signature
           && last_updated == other.last_updated && netID == other.netID;
     }
 
@@ -165,18 +162,9 @@ namespace llarp
     bool
     decode_key(const llarp_buffer_t& k, llarp_buffer_t* buf);
 
-    bool
-    HasNick() const;
-
-    std::string
-    Nick() const;
-
     bool
     IsPublicRouter() const;
 
-    void
-    SetNick(std::string_view nick);
-
     bool
     Verify(llarp_time_t now, bool allowExpired = true) const;