From 55b44cfc1394c0cf15eded8163e22c0e8c0b65b8 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Wed, 18 Dec 2019 13:35:01 -0500
Subject: [PATCH] fix derp nested function call and derp merge error

---
 llarp/ev/ev_libuv.cpp | 1 -
 llarp/link/server.cpp | 2 +-
 llarp/link/server.hpp | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/llarp/ev/ev_libuv.cpp b/llarp/ev/ev_libuv.cpp
index c0b9d5ff7..4d6d58746 100644
--- a/llarp/ev/ev_libuv.cpp
+++ b/llarp/ev/ev_libuv.cpp
@@ -822,7 +822,6 @@ namespace libuv
 #else
     uv_loop_configure(&m_Impl, UV_LOOP_BLOCK_SIGNAL, SIGPIPE);
 #endif
-    m_TickTimer->data   = this;
     m_LogicCaller.data = this;
     uv_async_init(&m_Impl, &m_LogicCaller, [](uv_async_t* h) {
       Loop* l = static_cast< Loop* >(h->data);
diff --git a/llarp/link/server.cpp b/llarp/link/server.cpp
index fcdf78fca..1957c4ac3 100644
--- a/llarp/link/server.cpp
+++ b/llarp/link/server.cpp
@@ -463,7 +463,7 @@ namespace llarp
   ILinkLayer::ScheduleTick(uint64_t interval)
   {
     tick_id = m_Logic->call_later(interval,
-                                  std::bind(&ILinkLayer::on_timer_tick, this));
+                                  std::bind(&ILinkLayer::OnTick, this));
   }
 
   void
diff --git a/llarp/link/server.hpp b/llarp/link/server.hpp
index eeed5fd87..d133aaae1 100644
--- a/llarp/link/server.hpp
+++ b/llarp/link/server.hpp
@@ -207,11 +207,6 @@ namespace llarp
     }
 
    private:
-    void
-    on_timer_tick()
-    {
-      OnTick();
-    }
 
     void
     OnTick();