Additional subscriber waits before Preparations

neo-project · Dec 2, 2019 · f422252 · f422252
1 parent 5b9b528
commit f422252
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/tests/neo.UnitTests/Consensus/UT_Consensus.cs b/tests/neo.UnitTests/Consensus/UT_Consensus.cs
@@ -129,7 +129,7 @@ public void ConsensusService_SingleNodeActors_OnStart_PrepReq_PrepResponses_Comm
             RecoveryRequest rrm = (RecoveryRequest)initialRecoveryPayload.ConsensusMessage;
             rrm.Timestamp.Should().Be(defaultTimestamp);
 
-            Console.WriteLine("Waiting for backupChange View... ");
+            Console.WriteLine("Waiting for backup ChangeView... ");
             var backupOnAskingChangeView = subscriber.ExpectMsg<LocalNode.SendDirectly>();
             var changeViewPayload = (ConsensusPayload)backupOnAskingChangeView.Inventory;
             ChangeView cvm = (ChangeView)changeViewPayload.ConsensusMessage;
@@ -193,13 +193,25 @@ public void ConsensusService_SingleNodeActors_OnStart_PrepReq_PrepResponses_Comm
 
             // Simulating CN 3
             actorConsensus.Tell(GetPayloadAndModifyValidator(prepResponsePayload, 2));
+            //Waiting for RecoveryRequest for a more deterministic UT
+            backupOnRecoveryDueToFailedNodes = subscriber.ExpectMsg<LocalNode.SendDirectly>();
+            recoveryPayload = (ConsensusPayload)backupOnRecoveryDueToFailedNodes.Inventory;
+            rrm = (RecoveryRequest)recoveryPayload.ConsensusMessage;
+            rrm.Timestamp.Should().Be(defaultTimestamp);
+            //Asserts
             Console.WriteLine("\nAsserting PreparationPayloads count is 3...");
             mockContext.Object.PreparationPayloads.Count(p => p != null).Should().Be(3);
             Console.WriteLine($"\nAsserting CountFailed is 4...");
             mockContext.Object.CountFailed.Should().Be(4);
 
             // Simulating CN 5
             actorConsensus.Tell(GetPayloadAndModifyValidator(prepResponsePayload, 4));
+            //Waiting for RecoveryRequest for a more deterministic UT
+            backupOnRecoveryDueToFailedNodes = subscriber.ExpectMsg<LocalNode.SendDirectly>();
+            recoveryPayload = (ConsensusPayload)backupOnRecoveryDueToFailedNodes.Inventory;
+            rrm = (RecoveryRequest)recoveryPayload.ConsensusMessage;
+            rrm.Timestamp.Should().Be(defaultTimestamp);
+            //Asserts            
             Console.WriteLine("\nAsserting PreparationPayloads count is 4...");
             mockContext.Object.PreparationPayloads.Count(p => p != null).Should().Be(4);
             Console.WriteLine($"\nAsserting CountFailed is 3...");