From 2f409181dd59924b1f0ae50bccf3539edf515aaa Mon Sep 17 00:00:00 2001
From: "Kieran R. Prasch" <kieranprasch@gmail.com>
Date: Sun, 9 Sep 2018 03:20:46 -0700
Subject: [PATCH] Remove more DHT cruft

---
 cli/main.py                  |  3 +--
 nucypher/characters.py       | 19 -------------------
 nucypher/config/constants.py |  6 +++---
 nucypher/network/server.py   |  2 --
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/cli/main.py b/cli/main.py
index 902eba1b2..ac72fa3b4 100755
--- a/cli/main.py
+++ b/cli/main.py
@@ -16,7 +16,7 @@ from nucypher.blockchain.eth.chains import Blockchain, TesterBlockchain
 from nucypher.blockchain.eth.deployers import NucypherTokenDeployer, MinerEscrowDeployer, PolicyManagerDeployer
 from nucypher.characters import Ursula
 from nucypher.config.constants import DEFAULT_CONFIG_ROOT, DEFAULT_SIMULATION_PORT, \
-    DEFAULT_SIMULATION_REGISTRY_FILEPATH, DEFAULT_INI_FILEPATH, DEFAULT_REST_PORT, DEFAULT_DHT_PORT, DEFAULT_DB_NAME, \
+    DEFAULT_SIMULATION_REGISTRY_FILEPATH, DEFAULT_INI_FILEPATH, DEFAULT_REST_PORT, DEFAULT_DB_NAME, \
     BASE_DIR
 from nucypher.config.metadata import write_node_metadata, collect_stored_nodes
 from nucypher.config.parsers import parse_nucypher_ini_config, parse_running_modes
@@ -688,7 +688,6 @@ def status(config, provider, contracts, network):
 @click.option('--seed-node', is_flag=True, default=False)
 @click.option('--rest-host', type=str, default='localhost')
 @click.option('--rest-port', type=int, default=DEFAULT_REST_PORT)
-@click.option('--dht-port', type=int, default=DEFAULT_DHT_PORT)
 @click.option('--db-name', type=str, default=DEFAULT_DB_NAME)
 @click.option('--checksum-address', type=str)
 @click.option('--data-dir', type=click.Path(), default=DEFAULT_CONFIG_ROOT)
diff --git a/nucypher/characters.py b/nucypher/characters.py
index 33cdb3625..715a61a7f 100644
--- a/nucypher/characters.py
+++ b/nucypher/characters.py
@@ -227,16 +227,6 @@ class Character:
 
         return cls(is_me=False, federated_only=federated_only, crypto_power=crypto_power, *args, **kwargs)
 
-    def attach_dht_server(self, ksize=20, alpha=3, id=None, storage=None, *args, **kwargs) -> None:
-        if self._dht_server:
-            raise RuntimeError("Attaching the server twice is almost certainly a bad idea.")
-
-        self._dht_server = self._dht_server_class(node_storage=self._known_nodes,  # TODO: 340
-                                                  treasure_map_storage=self._stored_treasure_maps,  # TODO: 340
-                                                  federated_only=self.federated_only,
-                                                  ksize=ksize, alpha=alpha, id=id,
-                                                  storage=storage, *args, **kwargs)
-
     @property
     def stamp(self):
         if self._stamp is constants.NO_SIGNING_POWER:
@@ -246,13 +236,6 @@ class Character:
         else:
             return self._stamp
 
-    @property
-    def dht_server(self) -> kademlia.network.Server:
-        if self._dht_server:
-            return self._dht_server
-        else:
-            raise RuntimeError("Server hasn't been attached.")
-
     ######
     # Knowing and learning about nodes
     ##
@@ -1122,7 +1105,6 @@ class Ursula(Character, VerifiableNode, Miner):
         if is_me is True:
             # TODO: 340
             self._stored_treasure_maps = {}
-            self.attach_dht_server()
             if not federated_only:
                 self.substantiate_stamp()
 
@@ -1136,7 +1118,6 @@ class Ursula(Character, VerifiableNode, Miner):
                     db_name=db_name,
                     network_middleware=self.network_middleware,
                     federated_only=self.federated_only,
-                    dht_server=self.dht_server,
                     treasure_map_tracker=self.treasure_maps,
                     node_tracker=self._known_nodes,
                     node_bytes_caster=self.__bytes__,
diff --git a/nucypher/config/constants.py b/nucypher/config/constants.py
index 4bde0613c..e17ff9179 100644
--- a/nucypher/config/constants.py
+++ b/nucypher/config/constants.py
@@ -14,12 +14,12 @@ APP_DIRS = AppDirs("nucypher", "NuCypher")
 PROJECT_ROOT = abspath(dirname(nucypher.__file__))
 
 DEFAULT_CONFIG_ROOT = APP_DIRS.user_data_dir
+TEMPLATE_INI_FILEPATH = os.path.join(BASE_DIR, 'cli', '.nucypher.ini')
 DEFAULT_INI_FILEPATH = os.path.join(DEFAULT_CONFIG_ROOT, 'nucypher.ini')
 DEFAULT_KEYRING_ROOT = os.path.join(DEFAULT_CONFIG_ROOT, 'keyring')
-DEFAULT_TLS_CERTIFICATE_FILEPATH = os.path.join(DEFAULT_CONFIG_ROOT, 'ursula.public.pem')
+DEFAULT_TLS_CERTIFICATE_FILEPATH = os.path.join(DEFAULT_CONFIG_ROOT, 'ursula.pem')
 
 DEFAULT_REST_PORT = 9151
-DEFAULT_DHT_PORT = DEFAULT_REST_PORT + 100
 DEFAULT_DB_NAME = "ursula.{port}.db".format(port=DEFAULT_REST_PORT)
 
 DEFAULT_SEED_NODE_DIR = os.path.join(DEFAULT_CONFIG_ROOT, 'seed_nodes')
@@ -30,5 +30,5 @@ DEFAULT_KNOWN_NODE_DIR = os.path.join(DEFAULT_CONFIG_ROOT, 'known_nodes')
 DEFAULT_KNOWN_CERTIFICATES_DIR = os.path.join(DEFAULT_KNOWN_NODE_DIR, 'certificates')
 DEFAULT_KNOWN_METADATA_DIR = os.path.join(DEFAULT_KNOWN_NODE_DIR, 'metadata')
 
-DEFAULT_SIMULATION_PORT = 5555
+DEFAULT_SIMULATION_PORT = 8151
 DEFAULT_SIMULATION_REGISTRY_FILEPATH = os.path.join(DEFAULT_CONFIG_ROOT, 'simulation_registry.json')
diff --git a/nucypher/network/server.py b/nucypher/network/server.py
index 1ad5f6697..b5b886edd 100644
--- a/nucypher/network/server.py
+++ b/nucypher/network/server.py
@@ -126,7 +126,6 @@ class ProxyRESTRoutes:
                  db_name,
                  network_middleware,
                  federated_only,
-                 dht_server,
                  treasure_map_tracker,
                  node_tracker,
                  node_bytes_caster,
@@ -138,7 +137,6 @@ class ProxyRESTRoutes:
 
         self.network_middleware = network_middleware
         self.federated_only = federated_only
-        self.dht_server = dht_server
 
         self._treasure_map_tracker = treasure_map_tracker
         self._work_order_tracker = work_order_tracker