Use HiveContext and HiveRouter properly

pybind/common.hpp

@@ -74,4 +74,10 @@ namespace tooling
 
   void
   RouterEvent_Init(py::module& mod);
+
+  void
+  HiveContext_Init(py::module& mod);
+
+  void
+  HiveRouter_Init(py::module& mod);
 }  // namespace tooling

pybind/llarp/context.cpp

@@ -37,4 +37,15 @@ namespace llarp
             })
         .def("CallSafe", &Context::CallSafe);
   }
+
 }  // namespace llarp
+
+namespace tooling
+{
+  void
+  HiveContext_Init(py::module& mod)
+  {
+    py::class_<tooling::HiveContext>(mod, "HiveContext")
+        .def("getRouterAsHiveRouter", &tooling::HiveContext::getRouterAsHiveRouter);
+  }
+}  // namespace tooling

pybind/llarp/router.cpp

@@ -21,7 +21,7 @@ namespace tooling
   void
   HiveRouter_Init(py::module& mod)
   {
-    py::class_<HiveRouter>(mod, "HiveRouter")
+    py::class_<HiveRouter, llarp::AbstractRouter>(mod, "HiveRouter")
         .def("disableGossiping", &HiveRouter::disableGossiping)
         .def("enableGossiping", &HiveRouter::enableGossiping);
   }

pybind/module.cpp

@@ -6,12 +6,14 @@ PYBIND11_MODULE(pyllarp, m)
   tooling::RouterHive_Init(m);
   tooling::RouterEvent_Init(m);
   llarp::AbstractRouter_Init(m);
+  tooling::HiveRouter_Init(m);
   llarp::PeerDb_Init(m);
   llarp::PeerStats_Init(m);
   llarp::RouterID_Init(m);
   llarp::RouterContact_Init(m);
   llarp::CryptoTypes_Init(m);
   llarp::Context_Init(m);
+  tooling::HiveContext_Init(m);
   llarp::Config_Init(m);
   llarp::dht::DHTTypes_Init(m);
   llarp::PathTypes_Init(m);

test/hive/test_peer_stats.py

@@ -77,10 +77,10 @@ def tally_rc_received_for_peer(hive, routerId):
 
   numFound = 0
 
-  def visit(relay):
+  def visit(context):
     nonlocal numFound
 
-    peerDb = relay.peerDb()
+    peerDb = context.getRouterAsHiveRouter().peerDb()
     stats = peerDb.getCurrentPeerStats(routerId);
 
     assert(stats.routerId == routerId)