From 45b3365002e2bae4b6b53105ec22bb83f7e0be5f Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Wed, 14 Sep 2022 18:20:35 -0300
Subject: [PATCH] Simplifications

- a `static` is less verbose and otherwise identical to an empty
  namespace for a single declaration like this.
- operator== on two optionals already does exactly what the `is_equal`
  lambda here is doing.
- formatting
---
 llarp/router/route_poker.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/llarp/router/route_poker.cpp b/llarp/router/route_poker.cpp
index 2284e798b..d52533ebd 100644
--- a/llarp/router/route_poker.cpp
+++ b/llarp/router/route_poker.cpp
@@ -7,10 +7,7 @@
 
 namespace llarp
 {
-  namespace
-  {
-    auto logcat = log::Cat("route-poker");
-  }
+  static auto logcat = log::Cat("route-poker");
 
   void
   RoutePoker::AddRoute(net::ipv4addr_t ip)
@@ -157,16 +154,8 @@ namespace llarp
         next_gw = *gw_ptr;
     }
 
-    auto is_equal = [](auto lhs, auto rhs) {
-      if (lhs == std::nullopt and rhs == std::nullopt)
-        return true;
-      if (lhs and rhs)
-        return *lhs == *rhs;
-      return false;
-    };
-
     // update current gateway and apply state chnages as needed
-    if (not is_equal(m_CurrentGateway, next_gw))
+    if (not(m_CurrentGateway == next_gw))
     {
       if (next_gw and m_CurrentGateway)
       {
@@ -224,8 +213,8 @@ namespace llarp
         route.AddDefaultRouteViaInterface(*vpn);
       log::info(logcat, "route poker up");
     }
-    if(not m_up)
-        SetDNSMode(true);
+    if (not m_up)
+      SetDNSMode(true);
     m_up = true;
   }
 
@@ -249,8 +238,8 @@ namespace llarp
       route.DelBlackhole();
       log::info(logcat, "route poker down");
     }
-    if(m_up)
-        SetDNSMode(false);
+    if (m_up)
+      SetDNSMode(false);
     m_up = false;
   }