arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-15 20:19:23 +00:00
Code Issues Releases Wiki Activity

Refactored Bridge transport, WIP

Browse Source
This commit is contained in:
slush0 2016-06-27 18:21:40 +02:00
parent 514a7643f5
commit 9b409ae6a4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
trezorlib/transport_bridge.py
View File

@ -4,7 +4,7 @@ import json
import requests import requests
from . import protobuf_json from . import protobuf_json
from . import messages_pb2 as proto from . import messages_pb2 as proto
from .transport import Transport from .transport import TransportV1
TREZORD_HOST = 'https://localback.net:21324' TREZORD_HOST = 'https://localback.net:21324'
CONFIG_URL = 'https://wallet.trezor.io/data/config_signed.bin' CONFIG_URL = 'https://wallet.trezor.io/data/config_signed.bin'
@ -12,7 +12,7 @@ CONFIG_URL = 'https://wallet.trezor.io/data/config_signed.bin'
def get_error(resp): def get_error(resp):
return ' (error=%d str=%s)' % (resp.status_code, resp.json()['error']) return ' (error=%d str=%s)' % (resp.status_code, resp.json()['error'])
class BridgeTransport(Transport): class BridgeTransport(TransportV1):
def __init__(self, device, *args, **kwargs): def __init__(self, device, *args, **kwargs):
self.configure() self.configure()
@ -41,7 +41,6 @@ class BridgeTransport(Transport):
""" """
Return a list of available TREZOR devices. Return a list of available TREZOR devices.
""" """
devices = {}
cls.configure() cls.configure()
r = requests.get(TREZORD_HOST + '/enumerate') r = requests.get(TREZORD_HOST + '/enumerate')
if r.status_code != 200: if r.status_code != 200:
@ -51,7 +50,6 @@ class BridgeTransport(Transport):
return enum return enum
def _open(self): def _open(self):
r = self.conn.post(TREZORD_HOST + '/acquire/%s' % self.path) r = self.conn.post(TREZORD_HOST + '/acquire/%s' % self.path)
if r.status_code != 200: if r.status_code != 200:
@ -66,10 +64,12 @@ class BridgeTransport(Transport):
else: else:
self.session = None self.session = None
def ready_to_read(self): def _ready_to_read(self):
return self.response != None return self.response != None
def _write(self, msg, protobuf_msg): def write(self, protobuf_msg):
# Override main 'write' method, HTTP transport cannot be
# splitted to chunks
cls = protobuf_msg.__class__.__name__ cls = protobuf_msg.__class__.__name__
msg = protobuf_json.pb2json(protobuf_msg) msg = protobuf_json.pb2json(protobuf_msg)
payload = '{"type": "%s", "message": %s}' % (cls, json.dumps(msg)) payload = '{"type": "%s", "message": %s}' % (cls, json.dumps(msg))
@ -85,4 +85,4 @@ class BridgeTransport(Transport):
cls = getattr(proto, self.response['type']) cls = getattr(proto, self.response['type'])
inst = cls() inst = cls()
pb = protobuf_json.json2pb(inst, self.response['message']) pb = protobuf_json.json2pb(inst, self.response['message'])
return ('protobuf', pb) return (0, 'protobuf', pb)