pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 08:47:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[client/network] Remove unused argument (#13444)

Browse Source 
* improve error message

* removed unused argument

* docs: disconnect_peer_inner no longer accepts `ban`

* remove redundant trace message

```
sync: Too many full nodes, rejecting 12D3KooWSQAP2fh4qBkLXBW4mvCtbAiK8sqMnExWHHTZtVAxZ8bQ
sync: 12D3KooWSQAP2fh4qBkLXBW4mvCtbAiK8sqMnExWHHTZtVAxZ8bQ disconnected
```

is enough to understand that we've refused to connect to the given peer

* Revert "removed unused argument"

This reverts commit c87f755b1fd03494fb446b604fe25c2418da7c87.

* ban peer for 10s after disconnect

* do not accept incoming conns if peer was banned

* Revert "do not accept incoming conns if peer was banned"

This reverts commit 7e59d05975765f2547468e9dcfd1361516c41e06.

* Revert "ban peer for 10s after disconnect"

This reverts commit 3859201ced42a5b2d18c0600e29efd20962a7289.

* Revert "Revert "removed unused argument""

This reverts commit f1dc623646dc5a69e1822c35f428e90dffe34d95.

* format code

* Revert "remove redundant trace message"

This reverts commit a87e65f08553dbe69027e9aa4f7ca4779ccaa7f2.
This commit is contained in:
Anton
2023-02-27 14:43:15 +04:00
committed by GitHub
parent 1d5ea509d0
commit bb00b262d7
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/protocol/notifications/behaviour.rs
+6 -24
View File
@@ -415,17 +415,11 @@ impl Notifications {
/// Disconnects the given peer if we are connected to it.
pub fn disconnect_peer(&mut self, peer_id: &PeerId, set_id: sc_peerset::SetId) {
trace!(target: "sub-libp2p", "External API => Disconnect({}, {:?})", peer_id, set_id);
self.disconnect_peer_inner(peer_id, set_id, None);
self.disconnect_peer_inner(peer_id, set_id);
}
/// Inner implementation of `disconnect_peer`. If `ban` is `Some`, we ban the peer
/// for the specific duration.
fn disconnect_peer_inner(
&mut self,
peer_id: &PeerId,
set_id: sc_peerset::SetId,
ban: Option<Duration>,
) {
/// Inner implementation of `disconnect_peer`.
fn disconnect_peer_inner(&mut self, peer_id: &PeerId, set_id: sc_peerset::SetId) {
let mut entry = if let Entry::Occupied(entry) = self.peers.entry((*peer_id, set_id)) {
entry
} else {
@@ -443,12 +437,8 @@ impl Notifications {
PeerState::DisabledPendingEnable { connections, timer_deadline, timer: _ } => {
trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
self.peerset.dropped(set_id, *peer_id, DropReason::Unknown);
let backoff_until = Some(if let Some(ban) = ban {
cmp::max(timer_deadline, Instant::now() + ban)
} else {
timer_deadline
});
*entry.into_mut() = PeerState::Disabled { connections, backoff_until }
*entry.into_mut() =
PeerState::Disabled { connections, backoff_until: Some(timer_deadline) }
},
// Enabled => Disabled.
@@ -496,8 +486,7 @@ impl Notifications {
.iter()
.any(|(_, s)| matches!(s, ConnectionState::Opening)));
let backoff_until = ban.map(|dur| Instant::now() + dur);
*entry.into_mut() = PeerState::Disabled { connections, backoff_until }
*entry.into_mut() = PeerState::Disabled { connections, backoff_until: None }
},
// Incoming => Disabled.
@@ -532,13 +521,6 @@ impl Notifications {
*connec_state = ConnectionState::Closing;
}
let backoff_until = match (backoff_until, ban) {
(Some(a), Some(b)) => Some(cmp::max(a, Instant::now() + b)),
(Some(a), None) => Some(a),
(None, Some(b)) => Some(Instant::now() + b),
(None, None) => None,
};
debug_assert!(!connections
.iter()
.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));