[Tests][Refactor] Move connect_nodes_bi to p2p_time_offset

random-zebra · random-zebra · commit 57dd5e732714 · 2020-03-30T14:06:18.000+02:00
diff --git a/test/functional/p2p_time_offset.py b/test/functional/p2p_time_offset.py
@@ -8,10 +8,14 @@
 from test_framework.test_framework import PivxTestFramework
 from test_framework.util import (
     assert_equal,
-    connect_nodes_bi,
-    set_node_times
+    connect_nodes,
+    set_node_times,
 )
 
+def connect_nodes_bi(nodes, a, b):
+    connect_nodes(nodes[a], b)
+    connect_nodes(nodes[b], a)
+
 class TimeOffsetTest(PivxTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
@@ -361,15 +361,12 @@ def connect_nodes(from_connection, node_num):
     # with transaction relaying
     wait_until(lambda:  all(peer['version'] != 0 for peer in from_connection.getpeerinfo()))
 
-def connect_nodes_bi(nodes, a, b):
-    connect_nodes(nodes[a], b)
-    connect_nodes(nodes[b], a)
-
 def connect_nodes_clique(nodes):
     l = len(nodes)
     for a in range(l):
         for b in range(a, l):
-            connect_nodes_bi(nodes, a, b)
+            connect_nodes(nodes[a], b)
+            connect_nodes(nodes[b], a)
 
 def sync_blocks(rpc_connections, *, wait=1, timeout=60):
     """
