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

xfer_util: update to new API

Browse Source
This commit is contained in:
Brian Warner 2017-03-04 12:41:54 +01:00
parent dfe9fd2395
commit 4c6cb1dddc
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wormhole/xfer_util.py
View File

@ -1,7 +1,7 @@
import json import json
from twisted.internet.defer import inlineCallbacks, returnValue from twisted.internet.defer import inlineCallbacks, returnValue
from .wormhole import wormhole from . import wormhole
from .tor_manager import TorManager from .tor_manager import TorManager
from .errors import NoTorError from .errors import NoTorError
@ -38,16 +38,17 @@ def receive(reactor, appid, relay_url, code,
raise NoTorError() raise NoTorError()
yield tm.start() yield tm.start()
wh = wormhole(appid, relay_url, reactor, tor_manager=tm) wh = wormhole.create(appid, relay_url, reactor, tor_manager=tm)
if code is None: if code is None:
code = yield wh.get_code() wh.allocate_code()
code = yield wh.when_code()
else: else:
wh.set_code(code) wh.set_code(code)
# we'll call this no matter what, even if you passed in a code -- # we'll call this no matter what, even if you passed in a code --
# maybe it should be only in the 'if' block above? # maybe it should be only in the 'if' block above?
if on_code: if on_code:
on_code(code) on_code(code)
data = yield wh.get() data = yield wh.when_received()
data = json.loads(data.decode("utf-8")) data = json.loads(data.decode("utf-8"))
offer = data.get('offer', None) offer = data.get('offer', None)
if not offer: if not offer:
@ -100,9 +101,10 @@ def send(reactor, appid, relay_url, data, code,
if not tm.tor_available(): if not tm.tor_available():
raise NoTorError() raise NoTorError()
yield tm.start() yield tm.start()
wh = wormhole(appid, relay_url, reactor, tor_manager=tm) wh = wormhole.create(appid, relay_url, reactor, tor_manager=tm)
if code is None: if code is None:
code = yield wh.get_code() wh.allocate_code()
code = yield wh.when_code()
else: else:
wh.set_code(code) wh.set_code(code)
if on_code: if on_code:
@ -115,7 +117,7 @@ def send(reactor, appid, relay_url, data, code,
} }
}).encode("utf-8") }).encode("utf-8")
) )
data = yield wh.get() data = yield wh.when_received()
data = json.loads(data.decode("utf-8")) data = json.loads(data.decode("utf-8"))
answer = data.get('answer', None) answer = data.get('answer', None)
yield wh.close() yield wh.close()