From 12853120484e19bbd9cf90574d5eaa9cb46255a5 Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Mon, 11 Dec 2017 11:55:54 -0500
Subject: [PATCH] [tests] fix flake8 warnings in node_network_limited.py

---
 test/functional/node_network_limited.py | 47 +++++++++++++------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/test/functional/node_network_limited.py b/test/functional/node_network_limited.py
index 40b876243b1..5229dfc99bb 100755
--- a/test/functional/node_network_limited.py
+++ b/test/functional/node_network_limited.py
@@ -2,9 +2,10 @@
 # Copyright (c) 2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
+from test_framework.messages import CInv, msg_getdata, msg_verack
+from test_framework.mininode import NetworkThread, P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
-from test_framework.mininode import *
+from test_framework.util import assert_equal
 
 class BaseNode(P2PInterface):
     nServices = 0
@@ -17,7 +18,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
         self.num_nodes = 1
         self.extra_args = [['-prune=550']]
 
-    def getSignaledServiceFlags(self):
+    def get_signalled_service_flags(self):
         node = self.nodes[0].add_p2p_connection(BaseNode())
         NetworkThread().start()
         node.wait_for_verack()
@@ -26,7 +27,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
         node.wait_for_disconnect()
         return services
 
-    def tryGetBlockViaGetData(self, blockhash, must_disconnect):
+    def try_get_block_via_getdata(self, blockhash, must_disconnect):
         node = self.nodes[0].add_p2p_connection(BaseNode())
         NetworkThread().start()
         node.wait_for_verack()
@@ -36,7 +37,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
         node.send_message(getdata_request)
 
         if (must_disconnect):
-            #ensure we get disconnected
+            # Ensure we get disconnected
             node.wait_for_disconnect(5)
         else:
             # check if the peer sends us the requested block
@@ -45,36 +46,36 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
             node.wait_for_disconnect()
 
     def run_test(self):
-        #NODE_BLOOM & NODE_WITNESS & NODE_NETWORK_LIMITED must now be signaled
-        assert_equal(self.getSignaledServiceFlags(), 1036) #1036 == 0x40C == 0100 0000 1100
-#                                                                              |        ||
-#                                                                              |        |^--- NODE_BLOOM
-#                                                                              |        ^---- NODE_WITNESS
-#                                                                              ^-- NODE_NETWORK_LIMITED
+        # NODE_BLOOM & NODE_WITNESS & NODE_NETWORK_LIMITED must now be signaled
+        assert_equal(self.get_signalled_service_flags(), 1036)  # 1036 == 0x40C == 0100 0000 1100
+#                                                                                   |        ||
+#                                                                                   |        |^--- NODE_BLOOM
+#                                                                                   |        ^---- NODE_WITNESS
+#                                                                                   ^-- NODE_NETWORK_LIMITED
 
-        #now mine some blocks over the NODE_NETWORK_LIMITED + 2(racy buffer ext.) target
+        # Now mine some blocks over the NODE_NETWORK_LIMITED + 2(racy buffer ext.) target
         firstblock = self.nodes[0].generate(1)[0]
         blocks = self.nodes[0].generate(292)
-        blockWithinLimitedRange = blocks[-1]
+        block_within_limited_range = blocks[-1]
 
-        #make sure we can max retrive block at tip-288
-        #requesting block at height 2 (tip-289) must fail (ignored)
-        self.tryGetBlockViaGetData(firstblock, True) #first block must lead to disconnect
-        self.tryGetBlockViaGetData(blocks[1], False) #last block in valid range
-        self.tryGetBlockViaGetData(blocks[0], True) #first block outside of the 288+2 limit
+        # Make sure we can max retrive block at tip-288
+        # requesting block at height 2 (tip-289) must fail (ignored)
+        self.try_get_block_via_getdata(firstblock, True)  # first block must lead to disconnect
+        self.try_get_block_via_getdata(blocks[1], False)  # last block in valid range
+        self.try_get_block_via_getdata(blocks[0], True)  # first block outside of the 288+2 limit
 
-        #NODE_NETWORK_LIMITED must still be signaled after restart
+        # NODE_NETWORK_LIMITED must still be signaled after restart
         self.restart_node(0)
-        assert_equal(self.getSignaledServiceFlags(), 1036)
+        assert_equal(self.get_signalled_service_flags(), 1036)
 
-        #test the RPC service flags
+        # Test the RPC service flags
         assert_equal(self.nodes[0].getnetworkinfo()['localservices'], "000000000000040c")
 
         # getdata a block above the NODE_NETWORK_LIMITED threshold must be possible
-        self.tryGetBlockViaGetData(blockWithinLimitedRange, False)
+        self.try_get_block_via_getdata(block_within_limited_range, False)
 
         # getdata a block below the NODE_NETWORK_LIMITED threshold must be ignored
-        self.tryGetBlockViaGetData(firstblock, True)
+        self.try_get_block_via_getdata(firstblock, True)
 
 if __name__ == '__main__':
     NodeNetworkLimitedTest().main()