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

flake8: make flake8 better and more strict

Browse Source 
this removes some unused variables and also catches a couple bugs
This commit is contained in:
matejcik 2018-04-03 21:25:07 +02:00
parent e3d59eedfb
commit 40ff849228
7 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.flake8
View File

@ -1,17 +1,13 @@
[flake8]
filename =
*.py,
trezorctl
./trezorctl
exclude =
.tox/,
build/,
dist/,
trezorlib/*_pb2.py
vendor/,
ignore =
# F821 undefined name 'unicode'
F821,
# F841 local variable is assigned to but never used
F841,
# F401: module imported but unused
F401,
# F403: used import *

2
.travis.yml
View File

@ -29,7 +29,7 @@ install:
script:
- python setup.py install
- flake8 . trezorctl --exclude=vendor
- flake8
- tox
notifications:

74
tools/signtest.py
View File

@ -111,7 +111,7 @@ class MyTxApiBitcoin(object):
txser = self.serialize_tx(t)
txhash = tools.Hash(txser)[::-1]
outi = self.inputs.append(
self.inputs.append(
proto_types.TxInputType(
address_n=self.client.expand_path("44'/0'/0'/0/%d" % idx),
script_type=(
@ -178,42 +178,42 @@ def main():
# Get the first address of first BIP44 account
# (should be the same address as shown in wallet.trezor.io)
outputs = [
proto_types.TxOutputType(
amount=0,
script_type=proto_types.PAYTOADDRESS,
address='p2xtZoXeX5X8BP8JfFhQK2nD3emtjch7UeFm'
# op_return_data=binascii.unhexlify('2890770995194662774cd192ee383b805e9a066e6a456be037727649228fb7f6')
# address_n=client.expand_path("44'/0'/0'/0/35"),
# address='3PUxV6Cc4udQZQsJhArVUzvvVoKC8ohkAj',
),
# proto_types.TxOutputType(
# amount=0,
# script_type=proto_types.PAYTOOPRETURN,
# op_return_data=binascii.unhexlify('2890770995194662774cd192ee383b805e9a066e6a456be037727649228fb7f6')
# ),
# proto_types.TxOutputType(
# amount= 8120,
# script_type=proto_types.PAYTOADDRESS,
# address_n=client.expand_path("44'/1'/0'/1/0"),
# address='1PtCkQgyN6xHmXWzLmFFrDNA5vYhYLeNFZ',
# address='14KRxYgFc7Se8j7MDdrK5PTNv8meq4GivK',
# ),
# proto_types.TxOutputType(
# amount= 18684 - 2000,
# script_type=proto_types.PAYTOADDRESS,
# address_n=client.expand_path("44'/0'/0'/0/7"),
# # address='1PtCkQgyN6xHmXWzLmFFrDNA5vYhYLeNFZ',
# # address='1s9TSqr3PHZdXGrYws59Uaf5SPqavH43z',
# ),
# proto_types.TxOutputType(
# amount= 1000,
# script_type=proto_types.PAYTOADDRESS,
# # address_n=client.expand_path("44'/0'/0'/0/18"),
# # address='1PtCkQgyN6xHmXWzLmFFrDNA5vYhYLeNFZ',
# # address='1NcMqUvyWv1K3Zxwmx5sqfj7ZEmPCSdJFM',
# ),
]
# outputs = [
# proto_types.TxOutputType(
# amount=0,
# script_type=proto_types.PAYTOADDRESS,
# address='p2xtZoXeX5X8BP8JfFhQK2nD3emtjch7UeFm'
# # op_return_data=binascii.unhexlify('2890770995194662774cd192ee383b805e9a066e6a456be037727649228fb7f6')
# # address_n=client.expand_path("44'/0'/0'/0/35"),
# # address='3PUxV6Cc4udQZQsJhArVUzvvVoKC8ohkAj',
# ),
# proto_types.TxOutputType(
# amount=0,
# script_type=proto_types.PAYTOOPRETURN,
# op_return_data=binascii.unhexlify('2890770995194662774cd192ee383b805e9a066e6a456be037727649228fb7f6')
# ),
# proto_types.TxOutputType(
# amount= 8120,
# script_type=proto_types.PAYTOADDRESS,
# address_n=client.expand_path("44'/1'/0'/1/0"),
# address='1PtCkQgyN6xHmXWzLmFFrDNA5vYhYLeNFZ',
# address='14KRxYgFc7Se8j7MDdrK5PTNv8meq4GivK',
# ),
# proto_types.TxOutputType(
# amount= 18684 - 2000,
# script_type=proto_types.PAYTOADDRESS,
# address_n=client.expand_path("44'/0'/0'/0/7"),
# # address='1PtCkQgyN6xHmXWzLmFFrDNA5vYhYLeNFZ',
# # address='1s9TSqr3PHZdXGrYws59Uaf5SPqavH43z',
# ),
# proto_types.TxOutputType(
# amount= 1000,
# script_type=proto_types.PAYTOADDRESS,
# # address_n=client.expand_path("44'/0'/0'/0/18"),
# # address='1PtCkQgyN6xHmXWzLmFFrDNA5vYhYLeNFZ',
# # address='1NcMqUvyWv1K3Zxwmx5sqfj7ZEmPCSdJFM',
# ),
# ]
# (signatures, serialized_tx) = client.sign_tx('Testnet', inputs, outputs)
(signatures, serialized_tx) = client.sign_tx('Bitcoin', txstore.get_inputs(), txstore.get_outputs())

2
trezorctl
View File

@ -233,7 +233,7 @@ def set_homescreen(connect, filename):
elif filename.endswith('.toif'):
img = open(filename, 'rb').read()
if img[:8] != b'TOIf\x90\x00\x90\x00':
raise CallException(types.Failure_DataError, 'File is not a TOIF file with size of 144x144')
raise CallException(proto.FailureType.DataError, 'File is not a TOIF file with size of 144x144')
else:
from PIL import Image
im = Image.open(filename)

8
trezorlib/client.py
View File

@ -42,11 +42,6 @@ from .protobuf import MessageType
if sys.version_info.major < 3:
raise Exception("Trezorlib does not support Python 2 anymore.")
# try:
# from PIL import Image
# SCREENSHOT = True
# except:
# SCREENSHOT = False
SCREENSHOT = False
@ -424,6 +419,7 @@ class DebugLinkMixin(object):
def call_raw(self, msg):
if SCREENSHOT and self.debug:
from PIL import Image
layout = self.debug.read_layout()
im = Image.new("RGB", (128, 64))
pix = im.load()
@ -804,7 +800,7 @@ class ProtocolMixin(object):
@session
def sign_tx(self, coin_name, inputs, outputs, version=None, lock_time=None, debug_processor=None):
start = time.time()
# start = time.time()
txes = self._prepare_sign_tx(inputs, outputs)
# Prepare and send initial message

2
trezorlib/transport/__init__.py
View File

@ -115,4 +115,4 @@ def get_transport(path=None, prefix_search=False):
if transports:
return transports[0].find_by_path(path, prefix_search=prefix_search)
raise Exception("Unknown path prefix '%s'" % prefix)
raise Exception("Could not find device by path: {}".format(path))

1
trezorlib/transport/udp.py
View File

@ -67,7 +67,6 @@ class UdpTransport(Transport):
@classmethod
def enumerate(cls):
devices = []
default_path = '{}:{}'.format(cls.DEFAULT_HOST, cls.DEFAULT_PORT)
try:
return [cls._try_path(default_path)]