From c6d050aca75ecf7a31d7038bfb6e9c09154b3abe Mon Sep 17 00:00:00 2001 From: jMyles Date: Tue, 6 Feb 2018 17:16:21 -0800 Subject: [PATCH] Making explicit which address and port are for Ursula's DHT interface. --- nkms/characters.py | 8 ++++---- tests/fixtures.py | 2 +- tests/utilities.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nkms/characters.py b/nkms/characters.py index 5a5753b8d..43105730e 100644 --- a/nkms/characters.py +++ b/nkms/characters.py @@ -448,8 +448,8 @@ class Ursula(Character): self._rest_app = App(routes=routes) def listen(self, port, interface): - self.port = port - self.interface = interface + self.dht_port = port + self.dht_interface = interface return self.server.listen(port, interface) def dht_interface_info(self): @@ -465,8 +465,8 @@ class Ursula(Character): def interface_hrac(self): return self.hash(msgpack.dumps(self.dht_interface_info())) - def publish_interface_information(self): - if not self.port and self.interface: + def publish_dht_information(self): + if not self.dht_port and self.dht_interface: raise RuntimeError("Must listen before publishing interface information.") dht_key = self.interface_dht_key() diff --git a/tests/fixtures.py b/tests/fixtures.py index 7f9508606..dd6d6b98f 100644 --- a/tests/fixtures.py +++ b/tests/fixtures.py @@ -47,7 +47,7 @@ def alice(ursulas): ALICE.attach_server() ALICE.server.listen(8471) ALICE.__resource_id = b"some_resource_id" - EVENT_LOOP.run_until_complete(ALICE.server.bootstrap([("127.0.0.1", u.port) for u in ursulas])) + EVENT_LOOP.run_until_complete(ALICE.server.bootstrap([("127.0.0.1", u.dht_port) for u in ursulas])) return ALICE diff --git a/tests/utilities.py b/tests/utilities.py index 8e4bb9360..4870f286a 100644 --- a/tests/utilities.py +++ b/tests/utilities.py @@ -43,7 +43,7 @@ def make_ursulas(how_many_ursulas: int, ursula_starting_port: int) -> list: for _counter, ursula in enumerate(URSULAS): event_loop.run_until_complete( ursula.server.bootstrap([("127.0.0.1", ursula_starting_port + _c) for _c in range(how_many_ursulas)])) - ursula.publish_interface_information() + ursula.publish_dht_information() return URSULAS