Skip to content

A0-1455: Enable two-way connections #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timorl merged 5 commits into from
Nov 10, 2022
Merged

A0-1455: Enable two-way connections #721

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41b971e
Enable two-way connections
timorl Nov 8, 2022
8809783
Add comments, remove typos
timorl Nov 10, 2022
ccc4f2a
Clarify legacy marking logic
timorl Nov 10, 2022
05f4dc2
Merge branch 'main' into A0-1455-a-map
timorl Nov 10, 2022
2108b2c
Linter
timorl Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Linter
  • Loading branch information
@timorl
timorl committed Nov 10, 2022
commit 2108b2cc86d92016dcb8b45e0c18eff853b71e42
6 changes: 3 additions & 3 deletions finality-aleph/src/validator_network/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ impl<D: Data, A: Data + Debug, ND: Dialer<A>, NL: Listener> Service<D, A, ND, NL

// Mark a peer as legacy and return whether it is the first time we do so.
fn mark_legacy(&mut self, peer_id: &AuthorityId) -> bool {
self.manager.remove_peer(&peer_id);
self.manager.remove_peer(peer_id);
self.legacy_connected.insert(peer_id.clone())
}

Expand All @@ -201,9 +201,9 @@ impl<D: Data, A: Data + Debug, ND: Dialer<A>, NL: Listener> Service<D, A, ND, NL
fn check_for_legacy(&mut self, peer_id: &AuthorityId, connection_type: ConnectionType) -> bool {
use ConnectionType::*;
match connection_type {
LegacyIncoming => self.mark_legacy(&peer_id),
LegacyIncoming => self.mark_legacy(peer_id),
LegacyOutgoing => {
self.mark_legacy(&peer_id);
self.mark_legacy(peer_id);
false
}
// We don't unmark here, because we always return New when a connection
Expand Down