Fix a merge issue. OnConsensusPayload method should not be accepting …

…PrepareRequest and PrepareResponse from different views.
neo-project · Mar 21, 2019 · 9838afc · 9838afc
1 parent b7e7981
commit 9838afc
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/neo/Consensus/ConsensusService.cs b/neo/Consensus/ConsensusService.cs
@@ -266,7 +266,11 @@ private void OnConsensusPayload(ConsensusPayload payload)
             foreach (IP2PPlugin plugin in Plugin.P2PPlugins)
                 if (!plugin.OnConsensusMessage(payload))
                     return;
-            switch (payload.ConsensusMessage)
+            ConsensusMessage message = payload.ConsensusMessage;
+            if (message.ViewNumber != context.ViewNumber && (message.Type == ConsensusMessageType.PrepareRequest ||
+                                                             message.Type == ConsensusMessageType.PrepareResponse))
+                return;
+            switch (message)
             {
                 case ChangeView view:
                     OnChangeViewReceived(payload, view);