ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 23:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of redundant 'introducer_clients' var

Browse Source
This commit is contained in:
meejah
2018-03-04 20:08:11 -07:00
parent c84e50baf0
commit e74d2a7d01
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/allmydata/client.py
View File

@ -233,7 +233,7 @@ def create_client_from_config(config, _client_factory=None):
)
control_tub = node.create_control_tub()
introducer_clients, introducer_furls = create_introducer_clients(config, main_tub)
introducer_clients = create_introducer_clients(config, main_tub)
storage_broker = create_storage_farm_broker(
config, default_connection_handlers, foolscap_connection_handlers,
tub_options, introducer_clients
@ -246,7 +246,6 @@ def create_client_from_config(config, _client_factory=None):
i2p_provider,
tor_provider,
introducer_clients,
introducer_furls,
storage_broker,
tub_is_listening=is_listening,
)
@ -271,16 +270,10 @@ def _sequencer(config):
def create_introducer_clients(config, main_tub):
"""
returns a 2-tuple containing two lists: introducer_clients,
introducer_furls
:returns: a list of IntroducerClient instances
"""
# (probably makes sense to return a list of 2-tuples instead of a
# 2-tuple of lists, but keeping variable names etc from when this
# was self.init_introducer_clients in Node)
# Returns both of these:
# we return this list
introducer_clients = []
introducer_furls = []
introducers_yaml_filename = config.get_private_path("introducers.yaml")
introducers_filepath = FilePath(introducers_yaml_filename)
@ -327,8 +320,8 @@ def create_introducer_clients(config, main_tub):
introducer_cache_filepath,
)
introducer_clients.append(ic)
introducer_furls.append(introducer['furl'])
return introducer_clients, introducer_furls
# introducer_furls.append(introducer['furl'])
return introducer_clients
def create_storage_farm_broker(config, default_connection_handlers, foolscap_connection_handlers, tub_options, introducer_clients):
@ -380,7 +373,7 @@ class _Client(node.Node, pollmixin.PollMixin):
"max_segment_size": 128*KiB,
}
def __init__(self, config, main_tub, control_tub, i2p_provider, tor_provider, introducer_clients, introducer_furls,
def __init__(self, config, main_tub, control_tub, i2p_provider, tor_provider, introducer_clients,
storage_farm_broker, tub_is_listening):
"""
Use create_client() to instantiate one of these.
@ -393,7 +386,6 @@ class _Client(node.Node, pollmixin.PollMixin):
self.encoding_params = self.DEFAULT_ENCODING_PARAMETERS.copy()
self.introducer_clients = introducer_clients
self.introducer_furls = introducer_furls # appears completely unused (but for tests?)
self.storage_broker = storage_farm_broker
self.init_stats_provider()