pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-24 15:55:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reserved peers don't occupy slots (#2546)

Browse Source
This commit is contained in:
Pierre Krieger
2019-05-13 11:02:51 +02:00
committed by Arkadiy Paronyan
parent 6cd82ca747
commit 258f0835e4
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/peerset/src/peersstate.rs
+17 -5
View File
@@ -268,11 +268,13 @@ impl<'a> ConnectedPeer<'a> {
pub fn disconnect(self) -> NotConnectedPeer<'a> { pub fn disconnect(self) -> NotConnectedPeer<'a> {
let connec_state = &mut self.state.connection_state; let connec_state = &mut self.state.connection_state;
match *connec_state { if !self.state.reserved {
ConnectionState::In => *self.num_in -= 1, match *connec_state {
ConnectionState::Out => *self.num_out -= 1, ConnectionState::In => *self.num_in -= 1,
ConnectionState::NotConnected => ConnectionState::Out => *self.num_out -= 1,
debug_assert!(false, "State inconsistency: disconnecting a disconnected node") ConnectionState::NotConnected =>
debug_assert!(false, "State inconsistency: disconnecting a disconnected node")
}
} }
*connec_state = ConnectionState::NotConnected; *connec_state = ConnectionState::NotConnected;
@@ -583,4 +585,14 @@ mod tests {
peers_state.peer(&id1).into_not_connected().unwrap().set_reputation(-100); peers_state.peer(&id1).into_not_connected().unwrap().set_reputation(-100);
assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id2.clone())); assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id2.clone()));
} }
#[test]
fn disconnect_reserved_doesnt_panic() {
let mut peers_state = PeersState::new(1, 1);
let id = PeerId::random();
let mut peer = peers_state.peer(&id).into_unknown().unwrap().discover()
.force_outgoing();
peer.set_reserved(true);
peer.disconnect();
}
} }