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

node: Move state transition code to session

This commit is contained in:
Alexis Sellier 2023-02-16 13:18:25 +01:00
parent 011923f1df
commit 71561a8e12
No known key found for this signature in database
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -603,16 +603,8 @@ where
}
if let Some(session) = self.sessions.get_mut(&remote) {
if let session::State::Connected { protocol, .. } = &mut session.state {
if let session::Protocol::Fetch { .. } = protocol {
*protocol = session::Protocol::default();
} else {
panic!(
"Unexpected session state for {}: expected 'fetch' protocol, got 'gossip'",
session.id
);
}
}
// Transition session back to gossip protocol.
session.to_gossip();
// Drain any messages in the session's outbox, which might have accumulated during the
// fetch, and send them to the peer.
self.reactor.drain(session);

13
radicle-node/src/service/session.rs
View File

@ -250,6 +250,19 @@ impl Session {
*protocol = Protocol::Fetch { rid };
}
pub fn to_gossip(&mut self) {
if let State::Connected { protocol, .. } = &mut self.state {
if let Protocol::Fetch { .. } = protocol {
*protocol = Protocol::default();
} else {
panic!(
"Unexpected session state for {}: expected 'fetch' protocol, got 'gossip'",
self.id
);
}
}
}
pub fn to_connecting(&mut self) {
assert!(
self.is_disconnected(),