dht: fix flaky test

Author: DanglingPointer

mtorrent-cli/tests/test_dht_node.rs

@@ -1,4 +1,4 @@
-use local_async_utils::sec;
+use local_async_utils::{millisec, sec};
 use mtorrent::app::dht;
 use mtorrent_dht::Command;
 use serde::Deserialize;
@@ -106,10 +106,13 @@ fn test_two_dht_nodes_discover_and_announce() {
     })
     .unwrap();
 
-    node1_cmds.blocking_send(Command::AddNode { addr: node2_addr }).unwrap();
+    // wait for both nodes to start up and bind to their ports
+    std::thread::sleep(sec!(1));
 
+    node1_cmds.blocking_send(Command::AddNode { addr: node2_addr }).unwrap();
     node2_cmds.blocking_send(Command::AddNode { addr: node1_addr }).unwrap();
 
+    // wait for the nodes to discover each other
     std::thread::sleep(sec!(2));
 
     let (result_sender, mut result_receiver1) = mpsc::channel(10);
@@ -147,7 +150,7 @@ fn test_two_dht_nodes_discover_and_announce() {
         if start_time.elapsed() > sec!(5) {
             panic!("Timeout waiting for nodes to discover each other");
         }
-        std::thread::sleep(sec!(1));
+        std::thread::sleep(millisec!(100));
     }
 
     assert!(discovered_by_node1.contains(&node2_addr), "Node 1 did not discover Node 2");

mtorrent-dht/src/processor.rs

@@ -147,6 +147,7 @@ impl Processor {
     }
 
     fn handle_node_event(&mut self, event: NodeEvent) {
+        log::trace!("Handling node event: {event:?}");
         match event {
             NodeEvent::Discovered(node) => {
                 if self.node_table.can_insert(&node.id) && self.known_nodes.insert(node.addr) {

mtorrent-dht/src/tasks.rs

@@ -37,6 +37,7 @@ fn validate_discovered_node(discovered: &Node, source: &Node, ctx: &Ctx) -> bool
 
 pub type Result<T> = std::result::Result<T, Error>;
 
+#[derive(Debug, Clone)]
 pub enum NodeEvent {
     Discovered(Node),
     Connected(Node),