NetIdentity: remove nick_suffix

electrumx/server/env.py

@@ -18,7 +18,7 @@ from electrumx.lib.env_base import EnvBase
 import electrumx.lib.util as lib_util
 
 
-NetIdentity = namedtuple('NetIdentity', 'host tcp_port ssl_port nick_suffix')
+NetIdentity = namedtuple('NetIdentity', 'host tcp_port ssl_port')
 
 
 class Env(EnvBase):
@@ -131,7 +131,6 @@ class Env(EnvBase):
             str(host),
             tcp_port,
             ssl_port,
-            ''
         )
 
     def tor_identity(self, clearnet):
@@ -162,7 +161,6 @@ class Env(EnvBase):
             host,
             tcp_port,
             ssl_port,
-            '_tor',
         )
 
     def hosts_dict(self):

tests/server/test_env.py

@@ -367,7 +367,6 @@ def test_clearnet_identity():
     assert ident.host == 'foo.com'
     assert ident.tcp_port == 456
     assert ident.ssl_port == 457
-    assert ident.nick_suffix == ''
 
 
 def test_tor_identity():
@@ -388,7 +387,6 @@ def test_tor_identity():
     assert ident.host == tor_host
     assert ident.tcp_port == 456
     assert ident.ssl_port == 123
-    assert ident.nick_suffix == '_tor'
     os.environ['REPORT_TCP_PORT_TOR'] = os.environ['REPORT_SSL_PORT_TOR']
     with pytest.raises(Env.Error):
         Env()