Skip to content

A0-1576: Improve network manager interface #815

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 2 commits into from
Dec 19, 2022
Merged

A0-1576: Improve network manager interface #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6168868
Improve network manager interface
Dec 15, 2022
9bb88d9
Two hard problems in CS
Dec 16, 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
40 changes: 0 additions & 40 deletions finality-aleph/src/network/io.rs
View file
Open in desktop

This file was deleted.

139 changes: 0 additions & 139 deletions finality-aleph/src/network/manager/mod.rs
View file
Open in desktop

This file was deleted.

59 changes: 3 additions & 56 deletions finality-aleph/src/network/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use std::{
collections::HashSet,
fmt::{Debug, Display},
hash::Hash,
};
Expand All @@ -11,58 +10,16 @@ use sp_runtime::traits::Block;
pub mod clique;
pub mod data;
mod gossip;
mod io;
mod manager;
#[cfg(test)]
pub mod mock;
mod session;
pub mod session;
mod substrate;
pub mod tcp;

#[cfg(test)]
pub use gossip::mock::{MockEvent, MockRawNetwork};
pub use gossip::{Network as GossipNetwork, Protocol, Service as GossipService};
pub use io::setup as setup_io;
use manager::SessionCommand;
pub use manager::{
ConnectionIO as ConnectionManagerIO, ConnectionManager, ConnectionManagerConfig,
};
pub use session::{Manager as SessionManager, ManagerError, SessionSender, IO as SessionManagerIO};
pub use substrate::protocol_name;
#[cfg(test)]
pub mod testing {
use super::manager::LegacyAuthentication;
pub use super::{
clique::mock::MockAddressingInformation,
gossip::mock::{MockEvent, MockRawNetwork},
manager::{
Authentication, DataInSession, DiscoveryMessage, LegacyDiscoveryMessage,
PeerAuthentications, SessionHandler, VersionedAuthentication,
},
};

pub fn legacy_authentication(
handler: &SessionHandler<MockAddressingInformation, MockAddressingInformation>,
) -> LegacyAuthentication<MockAddressingInformation> {
match handler
.authentication()
.expect("this is a validator handler")
{
PeerAuthentications::Both(_, authentication) => authentication,
_ => panic!("handler doesn't have both authentications"),
}
}

pub fn authentication(
handler: &SessionHandler<MockAddressingInformation, MockAddressingInformation>,
) -> Authentication<MockAddressingInformation> {
match handler
.authentication()
.expect("this is a validator handler")
{
PeerAuthentications::Both(authentication, _) => authentication,
_ => panic!("handler doesn't have both authentications"),
}
}
}

/// Represents the id of an arbitrary node.
pub trait PeerId: PartialEq + Eq + Clone + Debug + Display + Hash + Codec + Send {
Expand Down Expand Up @@ -121,17 +78,7 @@ pub trait RequestBlocks<B: Block>: Clone + Send + Sync + 'static {
fn is_major_syncing(&self) -> bool;
}

/// Commands for manipulating the reserved peers set.
#[derive(Debug, PartialEq, Eq)]
pub enum ConnectionCommand<A: AddressingInformation> {
AddReserved(HashSet<A>),
DelReserved(HashSet<A::PeerId>),
}

/// A basic alias for properties we expect basic data to satisfy.
pub trait Data: Clone + Codec + Send + Sync + 'static {}

impl<D: Clone + Codec + Send + Sync + 'static> Data for D {}

// In practice D: Data and P: PeerId, but we cannot require that in type aliases.
type AddressedData<D, P> = (D, P);
Loading