open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add reactor/cooperator to Wormhole and Boss calls

Browse Source
This commit is contained in:
Brian Warner 2018-06-30 14:15:06 -07:00
parent a693b1fc48
commit 6cfabba31a
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wormhole/_boss.py
View File

@ -38,6 +38,8 @@ class Boss(object):
_versions = attrib(validator=instance_of(dict)) _versions = attrib(validator=instance_of(dict))
_client_version = attrib(validator=instance_of(tuple)) _client_version = attrib(validator=instance_of(tuple))
_reactor = attrib() _reactor = attrib()
_eventual_queue = attrib()
_cooperator = attrib()
_journal = attrib(validator=provides(_interfaces.IJournal)) _journal = attrib(validator=provides(_interfaces.IJournal))
_tor = attrib(validator=optional(provides(_interfaces.ITorManager))) _tor = attrib(validator=optional(provides(_interfaces.ITorManager)))
_timing = attrib(validator=provides(_interfaces.ITiming)) _timing = attrib(validator=provides(_interfaces.ITiming))

5
src/wormhole/test/test_machines.py
View File

@ -1286,11 +1286,14 @@ class Boss(unittest.TestCase):
"closed") "closed")
versions = {"app": "version1"} versions = {"app": "version1"}
reactor = None reactor = None
eq = None
cooperator = None
journal = ImmediateJournal() journal = ImmediateJournal()
tor_manager = None tor_manager = None
client_version = ("python", __version__) client_version = ("python", __version__)
b = MockBoss(wormhole, "side", "url", "appid", versions, b = MockBoss(wormhole, "side", "url", "appid", versions,
client_version, reactor, journal, tor_manager, client_version, reactor, eq, cooperator, journal,
tor_manager,
timing.DebugTiming()) timing.DebugTiming())
b._T = Dummy("t", events, ITerminator, "close") b._T = Dummy("t", events, ITerminator, "close")
b._S = Dummy("s", events, ISend, "send") b._S = Dummy("s", events, ISend, "send")

9
src/wormhole/wormhole.py
View File

@ -5,6 +5,7 @@ import sys
from attr import attrib, attrs from attr import attrib, attrs
from twisted.python import failure from twisted.python import failure
from twisted.internet.task import Cooperator
from zope.interface import implementer from zope.interface import implementer
from ._boss import Boss from ._boss import Boss
@ -122,7 +123,8 @@ class _DelegatedWormhole(object):
@implementer(IWormhole, IDeferredWormhole) @implementer(IWormhole, IDeferredWormhole)
class _DeferredWormhole(object): class _DeferredWormhole(object):
def __init__(self, eq): def __init__(self, reactor, eq):
self._reactor = reactor
self._welcome_observer = OneShotObserver(eq) self._welcome_observer = OneShotObserver(eq)
self._code_observer = OneShotObserver(eq) self._code_observer = OneShotObserver(eq)
self._key = None self._key = None
@ -258,10 +260,11 @@ def create(
side = bytes_to_hexstr(os.urandom(5)) side = bytes_to_hexstr(os.urandom(5))
journal = journal or ImmediateJournal() journal = journal or ImmediateJournal()
eq = _eventual_queue or EventualQueue(reactor) eq = _eventual_queue or EventualQueue(reactor)
cooperator = Cooperator(scheduler=eq.eventually)
if delegate: if delegate:
w = _DelegatedWormhole(delegate) w = _DelegatedWormhole(delegate)
else: else:
w = _DeferredWormhole(eq) w = _DeferredWormhole(reactor, eq)
wormhole_versions = {} # will be used to indicate Wormhole capabilities wormhole_versions = {} # will be used to indicate Wormhole capabilities
wormhole_versions["app_versions"] = versions # app-specific capabilities wormhole_versions["app_versions"] = versions # app-specific capabilities
v = __version__ v = __version__
@ -269,7 +272,7 @@ def create(
v = v.decode("utf-8", errors="replace") v = v.decode("utf-8", errors="replace")
client_version = ("python", v) client_version = ("python", v)
b = Boss(w, side, relay_url, appid, wormhole_versions, client_version, b = Boss(w, side, relay_url, appid, wormhole_versions, client_version,
reactor, journal, tor, timing) reactor, eq, cooperator, journal, tor, timing)
w._set_boss(b) w._set_boss(b)
b.start() b.start()
return w return w