Allow optimistic mirror of kbuckets with read lock only

src/discv5.rs

@@ -477,6 +477,32 @@ impl<P: ProtocolIdentity> Discv5<P> {
             .collect()
     }
 
+    /// Takes a closure parameterized by type `Arc<RwLock<KBucketsTable<NodeId, Enr>>>` as
+    /// parameter. Caution: caller is responsible of dropping a lock taken on the kbuckets. We can
+    /// then for example take a read lock only to optimistically view the current keys in the
+    /// kbuckets (optimistic since it doesn't apply pending entries, which requires a write lock).
+    /// ```
+    /// use std::str::FromStr;
+    /// use discv5::{ConfigBuilder, Discv5, ListenConfig, Enr, enr::CombinedKey};
+    ///
+    /// let sk = CombinedKey::generate_secp256k1();
+    /// let enr = Enr::builder().build(&sk).unwrap();
+    /// let config = ConfigBuilder::new(ListenConfig::default()).build();
+    /// let discv5: Discv5 = Discv5::new(enr, sk, config).unwrap();
+    ///
+    /// let entries =  discv5.with_kbuckets(|kbuckets| kbuckets
+    ///     .read()
+    ///     .iter_ref()
+    ///     .map(|entry| *entry.node.key.preimage())
+    ///     .collect::<Vec<_>>());
+    /// ```
+    pub fn with_kbuckets<F, T>(&self, f: F) -> T
+    where
+        F: FnOnce(&Arc<RwLock<KBucketsTable<NodeId, Enr>>>) -> T,
+    {
+        f(&self.kbuckets)
+    }
+
     /// Requests the ENR of a node corresponding to multiaddr or multi-addr string.
     ///
     /// Only `ed25519` and `secp256k1` key types are currently supported.

src/handler/request_call.rs

@@ -1,4 +1,4 @@
-pub use crate::node_info::{NodeAddress, NodeContact};
+pub use crate::node_info::NodeContact;
 use crate::{
     packet::Packet,
     rpc::{Request, RequestBody},

src/kbucket.rs

@@ -533,7 +533,7 @@ where
 
     /// Returns an iterator over all the entries in the routing table.
     /// Does not add pending node to kbucket to get an iterator which
-    /// takes a reference instead of a mutable reference.
+    /// takes a mutable reference instead of a reference.
     pub fn iter_ref(&self) -> impl Iterator<Item = EntryRefView<'_, TNodeId, TVal>> {
         self.buckets.iter().flat_map(move |table| {
             table.iter().map(move |n| EntryRefView {

src/kbucket/entry.rs

@@ -25,9 +25,7 @@
 //! representing the nodes participating in the Kademlia DHT.
 
 pub use super::{
-    bucket::{
-        AppliedPending, ConnectionState, InsertResult, Node, NodeStatus, MAX_NODES_PER_BUCKET,
-    },
+    bucket::{AppliedPending, ConnectionState, InsertResult, Node, NodeStatus},
     key::*,
     ConnectionDirection,
 };