Fix handling of p2p server port config (#2232)

yzernik · web-flow · commit 93da9c0c9735 · 2022-06-17T19:04:31.000-07:00
diff --git a/squeaknode/config/config.py b/squeaknode/config/config.py
@@ -106,7 +106,7 @@ class TorConfig(Config):
 class ServerConfig(Config):
     enabled = key(cast=bool, required=False, default=True)
     host = key(cast=str, required=False, default=DEFAULT_SERVER_RPC_HOST)
-    port = key(cast=int, required=False, default=DEFAULT_SERVER_RPC_PORT)
+    port = key(cast=int, required=False, default=0)
     external_address = key(cast=str, required=False, default="")
     external_port = key(cast=int, required=False,
                         default=DEFAULT_EXTERNAL_PORT)
diff --git a/squeaknode/node/squeak_node.py b/squeaknode/node/squeak_node.py
@@ -228,7 +228,7 @@ def create_admin_web_server(self):
     def create_peer_web_server(self):
         self.peer_web_server = SqueakPeerWebServer(
             self.config.server.host,
-            squeak.params.params.DEFAULT_PORT,
+            self.config.server.port or squeak.params.params.DEFAULT_PORT,
             self.peer_handler,
         )
 
diff --git a/tests/node/test_squeak_controller.py b/tests/node/test_squeak_controller.py
@@ -167,5 +167,5 @@ def test_create_peer(squeak_store, squeak_controller, peer_address):
     squeak_store.create_peer.assert_called_with(
         "fake_peer_name",
         peer_address,
-        8555,
+        0,
     )

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ def create_admin_web_server(self):`
`228`	`228`	`def create_peer_web_server(self):`
`229`	`229`	`self.peer_web_server = SqueakPeerWebServer(`
`230`	`230`	`self.config.server.host,`
`231`		`- squeak.params.params.DEFAULT_PORT,`
	`231`	`+ self.config.server.port or squeak.params.params.DEFAULT_PORT,`
`232`	`232`	`self.peer_handler,`
`233`	`233`	`)`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -167,5 +167,5 @@ def test_create_peer(squeak_store, squeak_controller, peer_address):`
`167`	`167`	`squeak_store.create_peer.assert_called_with(`
`168`	`168`	`"fake_peer_name",`
`169`	`169`	`peer_address,`
`170`		`- 8555,`
	`170`	`+ 0,`
`171`	`171`	`)`