This commit is contained in:
meejah 2018-01-30 00:00:17 -07:00
parent 465bfb8053
commit 42c39d435a

View File

@ -15,6 +15,12 @@ from allmydata.introducer.interfaces import \
RIIntroducerPublisherAndSubscriberService_v2
from allmydata.introducer.common import unsign_from_foolscap, \
SubscriberDescriptor, AnnouncementDescriptor
from allmydata.node import read_config
from allmydata.node import create_connection_handlers
from allmydata.node import create_control_tub
from allmydata.node import create_tub_options
from allmydata.node import create_main_tub
# this is put into README in new node-directories
INTRODUCER_README = """
@ -37,10 +43,6 @@ class FurlFileConflictError(Exception):
def create_introducer(basedir=u"."):
# ideally we would pass in reactor
from twisted.internet import reactor
from allmydata.node import read_config, create_connection_handlers
from allmydata.node import create_control_tub
from allmydata.node import create_tub_options, create_main_tub
from allmydata.node import create_node_dir
if not os.path.exists(basedir):
create_node_dir(basedir, INTRODUCER_README)
@ -51,7 +53,6 @@ def create_introducer(basedir=u"."):
_valid_config_sections=_valid_config_sections,
)
# XXX fix up imports etc (also: reactor)
i2p_provider = create_i2p_provider(reactor, basedir, config)
tor_provider = create_tor_provider(reactor, basedir, config)
@ -66,7 +67,6 @@ def create_introducer(basedir=u"."):
)
control_tub = create_control_tub()
node = _IntroducerNode(
config,
main_tub,