refactor(kad): use oneshots and async-await for outbound streams

This refactoring addresses several aspects of the current handler implementation: - Remove the manual state machine for outbound streams in favor of using `async-await`. - Use `oneshot`s to track the number of requested outbound streams - Use `futures_bounded::FuturesMap` to track the execution of a stream, thus applying a timeout to the entire request. Resolves: #3130. Related: #3268. Related: #4510. Pull-Request: #4901.
libp2p · Nov 22, 2023 · add1ff6 · add1ff6
1 parent c718835
commit add1ff6
Show file tree

Hide file tree

Showing 4 changed files with 135 additions and 242 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
@@ -19,6 +19,7 @@ asynchronous-codec = { workspace = true }
 futures = "0.3.29"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
+futures-bounded = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }

diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
@@ -3173,6 +3173,7 @@ impl QueryInfo {
                         multiaddrs: external_addresses.clone(),
                         connection_ty: crate::protocol::ConnectionType::Connected,
                     },
+                    query_id,
                 },
             },
             QueryInfo::GetRecord { key, .. } => HandlerIn::GetRecord {