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

Fix networking debug_asserts (#8200)

Browse Source 
* Fix networking debug_asserts

* Fix comment
This commit is contained in:
Pierre Krieger
2021-02-25 13:51:29 +01:00
committed by GitHub
parent 241302d0e4
commit d5b308f13c
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/protocol/generic_proto/behaviour.rs
+18 -13
View File
@@ -1467,13 +1467,14 @@ impl NetworkBehaviour for GenericProto {
if let ConnectionState::Closed = *connec_state {
*connec_state = ConnectionState::OpenDesiredByRemote;
} else {
// Connections in `OpeningThenClosing` state are in a Closed phase,
// and as such can emit `OpenDesiredByRemote` messages.
// Since an `Open` and a `Close` messages have already been sent,
// Connections in `OpeningThenClosing` and `Closing` state can be
// in a Closed phase, and as such can emit `OpenDesiredByRemote`
// messages.
// Since an `Open` and/or a `Close` message have already been sent,
// there is nothing much that can be done about this anyway.
debug_assert!(matches!(
connec_state,
ConnectionState::OpeningThenClosing
ConnectionState::OpeningThenClosing | ConnectionState::Closing
));
}
} else {
@@ -1502,13 +1503,15 @@ impl NetworkBehaviour for GenericProto {
});
*connec_state = ConnectionState::Opening;
} else {
// Connections in `OpeningThenClosing` and `Opening` are in a Closed
// phase, and as such can emit `OpenDesiredByRemote` messages.
// Connections in `OpeningThenClosing`, `Opening`, and `Closing`
// state can be in a Closed phase, and as such can emit
// `OpenDesiredByRemote` messages.
// Since an `Open` message haS already been sent, there is nothing
// more to do.
debug_assert!(matches!(
connec_state,
ConnectionState::OpenDesiredByRemote | ConnectionState::Opening
ConnectionState::OpenDesiredByRemote |
ConnectionState::Closing | ConnectionState::Opening
));
}
} else {
@@ -1544,12 +1547,13 @@ impl NetworkBehaviour for GenericProto {
*entry.into_mut() = PeerState::Incoming { connections, backoff_until };
} else {
// Connections in `OpeningThenClosing` are in a Closed phase, and
// as such can emit `OpenDesiredByRemote` messages.
// Connections in `OpeningThenClosing` and `Closing` state can be
// in a Closed phase, and as such can emit `OpenDesiredByRemote`
// messages.
// We ignore them.
debug_assert!(matches!(
connec_state,
ConnectionState::OpeningThenClosing
ConnectionState::OpeningThenClosing | ConnectionState::Closing
));
*entry.into_mut() = PeerState::Disabled { connections, backoff_until };
}
@@ -1578,12 +1582,13 @@ impl NetworkBehaviour for GenericProto {
*entry.into_mut() = PeerState::Enabled { connections };
} else {
// Connections in `OpeningThenClosing` are in a Closed phase, and
// as such can emit `OpenDesiredByRemote` messages.
// Connections in `OpeningThenClosing` and `Closing` state can be
// in a Closed phase, and as such can emit `OpenDesiredByRemote`
// messages.
// We ignore them.
debug_assert!(matches!(
connec_state,
ConnectionState::OpeningThenClosing
ConnectionState::OpeningThenClosing | ConnectionState::Closing
));
*entry.into_mut() = PeerState::DisabledPendingEnable {
connections,