From 34b36b464b300ef22524f4da49e58a402d620486 Mon Sep 17 00:00:00 2001
From: Toralf Wittner <tw@dtex.org>
Date: Sat, 21 Dec 2019 17:14:59 +0100
Subject: [PATCH] Cover more cases in simultaneous connect test.

---
 core/tests/network_simult.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/tests/network_simult.rs b/core/tests/network_simult.rs
index 84f77c62..d01fea04 100644
--- a/core/tests/network_simult.rs
+++ b/core/tests/network_simult.rs
@@ -152,7 +152,7 @@ fn raw_swarm_simultaneous_connect() {
             Dialing,
             Connected,
             Replaced,
-            Errored
+            Denied
         }
 
         loop {
@@ -162,7 +162,7 @@ fn raw_swarm_simultaneous_connect() {
             let mut swarm1_dial_start = Delay::new(Duration::new(0, rand::random::<u32>() % 50_000_000));
             let mut swarm2_dial_start = Delay::new(Duration::new(0, rand::random::<u32>() % 50_000_000));
 
-            let future = future::poll_fn(|cx| -> Poll<bool> {
+            let future = future::poll_fn(|cx| {
                 loop {
                     let mut swarm1_not_ready = false;
                     let mut swarm2_not_ready = false;
@@ -202,7 +202,7 @@ fn raw_swarm_simultaneous_connect() {
                                 error: IncomingError::DeniedLowerPriority, ..
                             }) => {
                                 assert_eq!(swarm1_step, Step::Connected);
-                                swarm1_step = Step::Errored
+                                swarm1_step = Step::Denied
                             }
                             Poll::Ready(NetworkEvent::Connected { conn_info, .. }) => {
                                 assert_eq!(conn_info, *swarm2.local_peer_id());
@@ -233,7 +233,7 @@ fn raw_swarm_simultaneous_connect() {
                                 error: IncomingError::DeniedLowerPriority, ..
                             }) => {
                                 assert_eq!(swarm2_step, Step::Connected);
-                                swarm2_step = Step::Errored
+                                swarm2_step = Step::Denied
                             }
                             Poll::Ready(NetworkEvent::Connected { conn_info, .. }) => {
                                 assert_eq!(conn_info, *swarm1.local_peer_id());
@@ -260,9 +260,12 @@ fn raw_swarm_simultaneous_connect() {
 
                     match (swarm1_step, swarm2_step) {
                         | (Step::Connected, Step::Replaced)
-                        | (Step::Connected, Step::Errored)
+                        | (Step::Connected, Step::Denied)
                         | (Step::Replaced, Step::Connected)
-                        | (Step::Errored, Step::Connected) => return Poll::Ready(true),
+                        | (Step::Replaced, Step::Denied)
+                        | (Step::Replaced, Step::Replaced)
+                        | (Step::Denied, Step::Connected)
+                        | (Step::Denied, Step::Replaced) => return Poll::Ready(true),
                         _else => ()
                     }