Skip to content

A0-1664 Stop exposing sync connected events from substrate network #788

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

A0-1664 Stop exposing sync connected events from substrate network #788

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
698d03d
removing stuff
Dec 5, 2022
d0895b3
remove tests that do not work...
Dec 6, 2022
1ac10c8
Merge branch 'main' into A0-1664-stop-exposing!
lesniak43 Dec 6, 2022
09da9e7
polishing
Dec 6, 2022
a1de729
no ()
Dec 6, 2022
ad797ba
fmt
Dec 6, 2022
dac5bec
Merge branch 'main' into A0-1664-stop-exposing
lesniak43 Dec 6, 2022
c8607b0
Merge remote-tracking branch 'origin' into A0-1664-stop-exposing
maciejnems Dec 7, 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
Merge remote-tracking branch 'origin' into A0-1664-stop-exposing
  • Loading branch information
@maciejnems
maciejnems committed Dec 7, 2022
commit c8607b07f697373fbf9dd6b7001ab0c692b3f249
156 changes: 131 additions & 25 deletions finality-aleph/src/network/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ impl<N: Network, D: Data> Service<N, D> {

#[cfg(test)]
mod tests {
use std::iter;
use std::collections::HashSet;

use codec::Encode;
use futures::{
Expand All @@ -248,15 +248,10 @@ mod tests {
use super::Service;
use crate::{
network::{
manager::{SessionHandler, VersionedAuthentication},
mock::{crypto_basics, MockData, MockEvent, MockIO, MockNetwork},
testing::DiscoveryMessage,
Protocol,
mock::{MockData, MockEvent, MockNetwork, MockSenderError},
NetworkServiceIO, Protocol,
},
testing::mocks::validator_network::{
random_peer_id, MockMultiaddress, MockNetwork as MockValidatorNetwork,
},
SessionId,
testing::mocks::validator_network::random_peer_id,
};

const PROTOCOL: Protocol = Protocol::Authentication;
Expand Down Expand Up @@ -296,7 +291,6 @@ mod tests {

async fn cleanup(self) {
self.network.close_channels().await;
self.validator_network.close_channels().await;
}
}

Expand All @@ -305,25 +299,119 @@ mod tests {
}

#[tokio::test]
async fn test_send_validator_data() {
async fn test_notification_stream_opened() {
let mut test_data = TestData::prepare().await;

let peer_id = random_peer_id();
let peer_ids: Vec<_> = (0..3).map(|_| random_peer_id()).collect();

peer_ids.iter().for_each(|peer_id| {
test_data
.service
.handle_network_event(MockEvent::StreamOpened(peer_id.clone(), PROTOCOL))
.expect("Should handle");
});

let message = message(1);
test_data.service.broadcast(message.clone(), PROTOCOL);

let broadcasted_messages = HashSet::<_>::from_iter(
test_data
.network
.send_message
.take(peer_ids.len())
.await
.into_iter(),
);

let expected_messages = HashSet::from_iter(
peer_ids
.into_iter()
.map(|peer_id| (message.clone().encode(), peer_id, PROTOCOL)),
);

assert_eq!(broadcasted_messages, expected_messages);

test_data.cleanup().await
}

#[tokio::test]
async fn test_notification_stream_closed() {
let mut test_data = TestData::prepare().await;

let peer_ids: Vec<_> = (0..3).map(|_| random_peer_id()).collect();
let opened_authorities_n = 2;

peer_ids.iter().for_each(|peer_id| {
test_data
.service
.handle_network_event(MockEvent::StreamOpened(peer_id.clone(), PROTOCOL))
.expect("Should handle");
});

peer_ids
.iter()
.skip(opened_authorities_n)
.for_each(|peer_id| {
test_data
.service
.handle_network_event(MockEvent::StreamClosed(peer_id.clone(), PROTOCOL))
.expect("Should handle");
});

let message = message(1);
test_data.service.broadcast(message.clone(), PROTOCOL);

let broadcasted_messages = HashSet::<_>::from_iter(
test_data
.network
.send_message
.take(opened_authorities_n)
.await
.into_iter(),
);

let expected_messages = HashSet::from_iter(
peer_ids
.into_iter()
.take(opened_authorities_n)
.map(|peer_id| (message.clone().encode(), peer_id, PROTOCOL)),
);

assert_eq!(broadcasted_messages, expected_messages);

test_data.cleanup().await
}

#[tokio::test]
async fn test_create_sender_error() {
let mut test_data = TestData::prepare().await;

test_data
.network
.create_sender_errors
.lock()
.push_back(MockSenderError);

let peer_id = random_peer_id();

let message_1 = message(1);
let message_2 = message(4);

test_data
.mock_io
.data_for_network
.unbounded_send((message.clone(), peer_id.clone()))
.unwrap();
.service
.handle_network_event(MockEvent::StreamOpened(peer_id.clone(), PROTOCOL))
.expect("Should handle");

test_data.service.broadcast(message_1, PROTOCOL);

let expected = (message, peer_id);
test_data.service.broadcast(message_2.clone(), PROTOCOL);

let expected = (message_2.encode(), peer_id, PROTOCOL);

assert_eq!(
test_data
.validator_network
.send
.network
.send_message
.next()
.await
.expect("Should receive message"),
Expand All @@ -334,21 +422,39 @@ mod tests {
}

#[tokio::test]
async fn test_receives_validator_data() {
async fn test_send_error() {
let mut test_data = TestData::prepare().await;

let message = message(1);
test_data
.network
.send_errors
.lock()
.push_back(MockSenderError);

let peer_id = random_peer_id();

let message_1 = message(1);
let message_2 = message(4);

test_data
.service
.handle_network_event(MockEvent::StreamOpened(peer_id.clone(), PROTOCOL))
.expect("Should handle");

test_data.service.broadcast(message_1, PROTOCOL);

test_data.validator_network.next.send(message.clone());
test_data.service.broadcast(message_2.clone(), PROTOCOL);

let expected = (message_2.encode(), peer_id, PROTOCOL);

assert_eq!(
test_data
.mock_io
.data_from_network
.network
.send_message
.next()
.await
.expect("Should receive message"),
message,
expected,
);

test_data.cleanup().await
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.