Merge ce6dd37 into cc6fd89

CHANGELOG.rst

@@ -6,7 +6,7 @@ All notable changes to this project are documented in this file.
 [0.9.2] In progress
 -------------------
 - Fix shutdown operations when initializing np-api-server and setting minpeers/maxpeers, opening a wallet, or changing databases
-
+- Minor improvement to network recovery logic when running out of good node addresses
 
 [0.9.1] 2019-09-16 
 ------------------

neo/Network/nodemanager.py

@@ -2,6 +2,7 @@
 import socket
 import traceback
 import errno
+import random
 from contextlib import suppress
 from datetime import datetime
 from functools import partial
@@ -140,6 +141,7 @@ def check_open_spots_and_queue_nodes(self) -> None:
                             # we have no other option then to retry any address we know
                             logger.debug("Recycling old addresses")
                             self.known_addresses = self.bad_addresses
+                            random.shuffle(self.known_addresses)
                             self.bad_addresses = []
                             self.MAX_NODE_POOL_ERROR_COUNT = 0