AaronFiore/electrum
1
0
Fork 0
Code Activity

trezor: re-enable bridge transport

Browse Source 
It was disabled in 680df7d6b6 due to #4421,
but that has since been fixed.
Also related is #4060; and now that that is closed, the bridge transport
is not proxied anyway.
This commit is contained in:
SomberNight
2018-09-19 18:14:55 +02:00
parent 9161e8c8f4
commit 8caab35d90
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/plugins/safe_t/transport.py
View File

@@ -8,6 +8,8 @@ class SafeTTransport(PrintError):
"""Reimplemented safetlib.transport.all_transports so that we can """Reimplemented safetlib.transport.all_transports so that we can
enable/disable specific transports. enable/disable specific transports.
""" """
# NOTE: the bridge and UDP transports are disabled as they are using
# the same ports as trezor
try: try:
# only to detect safetlib version # only to detect safetlib version
from safetlib.transport import all_transports from safetlib.transport import all_transports

20
electrum/plugins/trezor/transport.py
View File

@@ -14,11 +14,11 @@ class TrezorTransport(PrintError):
except ImportError: except ImportError:
# old trezorlib. compat for trezorlib < 0.9.2 # old trezorlib. compat for trezorlib < 0.9.2
transports = [] transports = []
#try: try:
# from trezorlib.transport_bridge import BridgeTransport from trezorlib.transport_bridge import BridgeTransport
# transports.append(BridgeTransport) transports.append(BridgeTransport)
#except BaseException: except BaseException:
# pass pass
try: try:
from trezorlib.transport_hid import HidTransport from trezorlib.transport_hid import HidTransport
transports.append(HidTransport) transports.append(HidTransport)
@@ -37,11 +37,11 @@ class TrezorTransport(PrintError):
else: else:
# new trezorlib. # new trezorlib.
transports = [] transports = []
#try: try:
# from trezorlib.transport.bridge import BridgeTransport from trezorlib.transport.bridge import BridgeTransport
# transports.append(BridgeTransport) transports.append(BridgeTransport)
#except BaseException: except BaseException:
# pass pass
try: try:
from trezorlib.transport.hid import HidTransport from trezorlib.transport.hid import HidTransport
transports.append(HidTransport) transports.append(HidTransport)