pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-23 09:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite reconnect_after_disconnect test (#5351)

Browse Source
This commit is contained in:
Pierre Krieger
2020-03-23 11:50:11 +01:00
committed by GitHub
parent 26a204da21
commit 1da48b3b3f
1 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/protocol/generic_proto/tests.rs
+42 -39
View File
@@ -345,13 +345,21 @@ fn reconnect_after_disconnect() {
let mut service1_state = ServiceState::NotConnected; let mut service1_state = ServiceState::NotConnected;
let mut service2_state = ServiceState::NotConnected; let mut service2_state = ServiceState::NotConnected;
// Run the events loops. futures::executor::block_on(async move {
futures::executor::block_on(future::poll_fn(|cx| -> Poll<Result<_, io::Error>> {
loop { loop {
let mut service1_not_ready = false; // Grab next event from services.
let event = {
let s1 = service1.next();
let s2 = service2.next();
futures::pin_mut!(s1, s2);
match future::select(s1, s2).await {
future::Either::Left((ev, _)) => future::Either::Left(ev),
future::Either::Right((ev, _)) => future::Either::Right(ev),
}
};
match service1.poll_next_unpin(cx) { match event {
Poll::Ready(Some(GenericProtoOut::CustomProtocolOpen { .. })) => { future::Either::Left(GenericProtoOut::CustomProtocolOpen { .. }) => {
match service1_state { match service1_state {
ServiceState::NotConnected => { ServiceState::NotConnected => {
service1_state = ServiceState::FirstConnec; service1_state = ServiceState::FirstConnec;
@@ -363,19 +371,14 @@ fn reconnect_after_disconnect() {
ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(), ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
} }
}, },
Poll::Ready(Some(GenericProtoOut::CustomProtocolClosed { .. })) => { future::Either::Left(GenericProtoOut::CustomProtocolClosed { .. }) => {
match service1_state { match service1_state {
ServiceState::FirstConnec => service1_state = ServiceState::Disconnected, ServiceState::FirstConnec => service1_state = ServiceState::Disconnected,
ServiceState::ConnectedAgain| ServiceState::NotConnected | ServiceState::ConnectedAgain| ServiceState::NotConnected |
ServiceState::Disconnected => panic!(), ServiceState::Disconnected => panic!(),
} }
}, },
Poll::Pending => service1_not_ready = true, future::Either::Right(GenericProtoOut::CustomProtocolOpen { .. }) => {
_ => panic!()
}
match service2.poll_next_unpin(cx) {
Poll::Ready(Some(GenericProtoOut::CustomProtocolOpen { .. })) => {
match service2_state { match service2_state {
ServiceState::NotConnected => { ServiceState::NotConnected => {
service2_state = ServiceState::FirstConnec; service2_state = ServiceState::FirstConnec;
@@ -387,43 +390,43 @@ fn reconnect_after_disconnect() {
ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(), ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
} }
}, },
Poll::Ready(Some(GenericProtoOut::CustomProtocolClosed { .. })) => { future::Either::Right(GenericProtoOut::CustomProtocolClosed { .. }) => {
match service2_state { match service2_state {
ServiceState::FirstConnec => service2_state = ServiceState::Disconnected, ServiceState::FirstConnec => service2_state = ServiceState::Disconnected,
ServiceState::ConnectedAgain| ServiceState::NotConnected | ServiceState::ConnectedAgain| ServiceState::NotConnected |
ServiceState::Disconnected => panic!(), ServiceState::Disconnected => panic!(),
} }
}, },
Poll::Pending if service1_not_ready => break, _ => {}
Poll::Pending => {} }
_ => panic!()
if service1_state == ServiceState::ConnectedAgain && service2_state == ServiceState::ConnectedAgain {
break;
} }
} }
if service1_state == ServiceState::ConnectedAgain && service2_state == ServiceState::ConnectedAgain { // Now that the two services have disconnected and reconnected, wait for 3 seconds and
Poll::Ready(Ok(())) // check whether they're still connected.
} else { let mut delay = futures_timer::Delay::new(Duration::from_secs(3));
Poll::Pending
}
})).unwrap();
// Do a second 3-seconds run to make sure we don't get disconnected immediately again. loop {
let mut delay = futures_timer::Delay::new(Duration::from_secs(3)); // Grab next event from services.
futures::executor::block_on(future::poll_fn(|cx| -> Poll<Result<_, io::Error>> { let event = {
match service1.poll_next_unpin(cx) { let s1 = service1.next();
Poll::Pending => {}, let s2 = service2.next();
_ => panic!() futures::pin_mut!(s1, s2);
} match future::select(future::select(s1, s2), &mut delay).await {
future::Either::Right(_) => break, // success
future::Either::Left((future::Either::Left((ev, _)), _)) => ev,
future::Either::Left((future::Either::Right((ev, _)), _)) => ev,
}
};
match service2.poll_next_unpin(cx) { match event {
Poll::Pending => {}, GenericProtoOut::CustomProtocolOpen { .. } |
_ => panic!() GenericProtoOut::CustomProtocolClosed { .. } => panic!(),
_ => {}
}
} }
});
if let Poll::Ready(()) = delay.poll_unpin(cx) {
Poll::Ready(Ok(()))
} else {
Poll::Pending
}
})).unwrap();
} }