mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Add `Disconnect` command 

This is useful especially in tests to disconnect two nodes. We also
expose `command` on the handle type (but not the trait).
This commit is contained in:
Alexis Sellier 2023-05-02 12:04:58 +02:00
parent 0bfc3f59ee
commit 448ef67833
No known key found for this signature in database
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicle-node/src/runtime/handle.rs
View File

@ -114,7 +114,7 @@ impl Handle {
self.controller.cmd(wire::Control::Flush { remote, stream })
}
fn command(&self, cmd: service::Command) -> Result<(), io::Error> {
pub(crate) fn command(&self, cmd: service::Command) -> Result<(), io::Error> {
self.controller.cmd(wire::Control::User(cmd))
}
}

10
radicle-node/src/service.rs
View File

@ -126,6 +126,8 @@ pub enum Command {
SyncInventory(chan::Sender<bool>),
/// Connect to node with the given address.
Connect(NodeId, Address),
/// Disconnect from node.
Disconnect(NodeId),
/// Lookup seeds for the given repository in the routing table.
Seeds(Id, chan::Sender<Seeds>),
/// Fetch the given repository from the network.
@ -149,6 +151,7 @@ impl fmt::Debug for Command {
Self::AnnounceInventory => write!(f, "AnnounceInventory"),
Self::SyncInventory(_) => write!(f, "SyncInventory(..)"),
Self::Connect(id, addr) => write!(f, "Connect({id}, {addr})"),
Self::Disconnect(id) => write!(f, "Disconnect({id})"),
Self::Seeds(id, _) => write!(f, "Seeds({id})"),
Self::Fetch(id, node, _) => write!(f, "Fetch({id}, {node})"),
Self::TrackRepo(id, scope, _) => write!(f, "TrackRepo({id}, {scope})"),
@ -466,6 +469,9 @@ where
Command::Connect(nid, addr) => {
self.connect(nid, addr);
}
Command::Disconnect(nid) => {
self.reactor.disconnect(nid, DisconnectReason::Command);
}
Command::Seeds(rid, resp) => match self.seeds(&rid) {
Ok(seeds) => {
resp.send(seeds).ok();
@ -1547,6 +1553,8 @@ pub enum DisconnectReason {
Fetch(FetchError),
/// Session error.
Session(session::Error),
/// User requested disconnect
Command,
}
impl DisconnectReason {
@ -1564,6 +1572,7 @@ impl DisconnectReason {
match self {
Self::Dial(_) => false,
Self::Connection(_) => true,
Self::Command => false,
Self::Fetch(_) => true,
Self::Session(err) => err.is_transient(),
}
@ -1575,6 +1584,7 @@ impl fmt::Display for DisconnectReason {
match self {
Self::Dial(err) => write!(f, "{err}"),
Self::Connection(err) => write!(f, "{err}"),
Self::Command => write!(f, "command"),
Self::Session(err) => write!(f, "{err}"),
Self::Fetch(err) => write!(f, "fetch: {err}"),
}