Browse Source

TorNet: refactor IPv4 and IPv6 templates into a single string constant

Turns out it's easy for these to get out of sync.
teor 4 years ago
parent
commit
a5a7da490a
1 changed files with 12 additions and 10 deletions
  1. 12 10
      lib/chutney/TorNet.py

+ 12 - 10
lib/chutney/TorNet.py

@@ -649,17 +649,19 @@ class LocalNodeBuilder(NodeBuilder):
             transport = ""
             extra = ""
 
-        bridgelines = "Bridge %s %s:%s %s %s\n" % (transport,
-                                             self._env['ip'],
-                                             port,
-                                             self._env['fingerprint'],
-                                             extra)
+        BRIDGE_LINE_TEMPLATE = "Bridge %s %s:%s %s %s\n"
+
+        bridgelines = BRIDGE_LINE_TEMPLATE % (transport,
+                                              self._env['ip'],
+                                              port,
+                                              self._env['fingerprint'],
+                                              extra)
         if self._env['ipv6_addr'] is not None:
-            bridgelines += "Bridge %s %s:%s %s %s\n" % (transport,
-                                               self._env['ipv6_addr'],
-                                               port,
-                                               self._env['fingerprint'],
-                                               extra)
+            bridgelines += BRIDGE_LINE_TEMPLATE % (transport,
+                                                   self._env['ipv6_addr'],
+                                                   port,
+                                                   self._env['fingerprint'],
+                                                   extra)
         return bridgelines