restore llarp_make_ev_loop() as we only use libuv now; separate function is now ded code

libabyss/main.cpp

@@ -117,7 +117,9 @@ main(ABSL_ATTRIBUTE_UNUSED int argc, ABSL_ATTRIBUTE_UNUSED char* argv[])
 #endif
   llarp::SetLogLevel(llarp::eLogDebug);
   llarp_threadpool* threadpool = llarp_init_same_process_threadpool();
-  llarp_ev_loop_ptr loop       = llarp_make_uv_loop();
+  // Now that libuv is the single non-Windows event loop impl, we can
+  // go back to using the normal function
+  llarp_ev_loop_ptr loop       = llarp_make_ev_loop();
   auto logic                   = std::make_shared< llarp::Logic >(threadpool);
   sockaddr_in addr;
   addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);

llarp/context.cpp

@@ -246,11 +246,7 @@ __        ___    ____  _   _ ___ _   _  ____
   {
     llarp::LogInfo(LLARP_VERSION, " ", LLARP_RELEASE_MOTTO);
     llarp::LogInfo("starting up");
-#if defined(WIN32)
     mainloop = llarp_make_ev_loop();
-#else
-    mainloop = llarp_make_uv_loop();
-#endif
     // ensure worker thread pool
     if(!worker && !singleThreaded)
       worker.reset(llarp_init_threadpool(2, "llarp-worker"));

llarp/ev/ev.h

@@ -51,14 +51,11 @@ namespace llarp
 
 using llarp_ev_loop_ptr = std::shared_ptr< llarp_ev_loop >;
 
-/// make an event loop using our baked in event loop, ew.
+/// make an event loop using our baked in event loop on Windows
+/// make an event loop using libuv otherwise.
 llarp_ev_loop_ptr
 llarp_make_ev_loop();
 
-/// make an event loop using libuv
-llarp_ev_loop_ptr
-llarp_make_uv_loop();
-
 // run mainloop
 void
 llarp_ev_loop_run_single_process(llarp_ev_loop_ptr ev,

llarp/ev/ev_libuv.cpp

@@ -630,12 +630,3 @@ namespace libuv
   }
 
 }  // namespace libuv
-
-llarp_ev_loop_ptr
-llarp_make_uv_loop()
-{
-  auto loop = std::make_shared< libuv::Loop >();
-  if(loop->init())
-    return loop;
-  return nullptr;
-}

test/link/test_llarp_link.cpp

@@ -121,7 +121,7 @@ struct LinkLayerTest : public test::LlarpTest< NoOpCrypto >
     oldRCLifetime               = RouterContact::Lifetime;
     RouterContact::IgnoreBogons = true;
     RouterContact::Lifetime     = 500;
-    netLoop                     = llarp_make_uv_loop();
+    netLoop                     = llarp_make_ev_loop();
     m_logic.reset(new Logic());
   }
 

test/test_libabyss.cpp

@@ -48,7 +48,7 @@ struct AbyssTestBase : public ::testing::Test
   Start()
   {
     threadpool = llarp_init_same_process_threadpool();
-    loop       = llarp_make_uv_loop();
+    loop       = llarp_make_ev_loop();
     logic      = std::make_shared< llarp::Logic >(threadpool);
 
     sockaddr_in addr;