From 845a3a7e0da617c84841383528d7d40abe931140 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 7 Jun 2017 19:06:26 +0200 Subject: [PATCH] tests: add partial pylint support --- Makefile | 3 ++ mocks/micropython.py | 2 +- mocks/ubinascii.py | 11 ++++-- mocks/uctypes.py | 37 +++++++++++++++++++ mocks/ustruct.py | 10 ++--- mocks/utime.py | 19 ++++++---- pylint.rc | 2 + src/apps/fido_u2f/__init__.py | 2 + src/main.py | 2 + src/trezor/messages/Address.py | 2 + src/trezor/messages/ApplySettings.py | 2 + src/trezor/messages/ButtonAck.py | 2 + src/trezor/messages/ButtonRequest.py | 2 + src/trezor/messages/ButtonRequestType.py | 2 + src/trezor/messages/Cancel.py | 2 + src/trezor/messages/ChangePin.py | 2 + src/trezor/messages/CipherKeyValue.py | 2 + src/trezor/messages/CipheredKeyValue.py | 2 + src/trezor/messages/ClearSession.py | 2 + src/trezor/messages/CoinType.py | 2 + src/trezor/messages/DebugLinkDecision.py | 2 + src/trezor/messages/DebugLinkFlashErase.py | 2 + src/trezor/messages/DebugLinkGetState.py | 2 + src/trezor/messages/DebugLinkLog.py | 2 + src/trezor/messages/DebugLinkMemory.py | 2 + src/trezor/messages/DebugLinkMemoryRead.py | 2 + src/trezor/messages/DebugLinkMemoryWrite.py | 2 + src/trezor/messages/DebugLinkState.py | 2 + src/trezor/messages/DebugLinkStop.py | 2 + src/trezor/messages/DecryptMessage.py | 2 + src/trezor/messages/DecryptedMessage.py | 2 + src/trezor/messages/ECDHSessionKey.py | 2 + src/trezor/messages/EncryptMessage.py | 2 + src/trezor/messages/EncryptedMessage.py | 2 + src/trezor/messages/Entropy.py | 2 + src/trezor/messages/EntropyAck.py | 2 + src/trezor/messages/EntropyRequest.py | 2 + src/trezor/messages/EstimateTxSize.py | 2 + src/trezor/messages/EthereumAddress.py | 2 + src/trezor/messages/EthereumGetAddress.py | 2 + src/trezor/messages/EthereumSignTx.py | 2 + src/trezor/messages/EthereumTxAck.py | 2 + src/trezor/messages/EthereumTxRequest.py | 2 + src/trezor/messages/Failure.py | 2 + src/trezor/messages/FailureType.py | 2 + src/trezor/messages/Features.py | 2 + src/trezor/messages/FirmwareErase.py | 2 + src/trezor/messages/FirmwareRequest.py | 2 + src/trezor/messages/FirmwareUpload.py | 2 + src/trezor/messages/GetAddress.py | 2 + src/trezor/messages/GetECDHSessionKey.py | 2 + src/trezor/messages/GetEntropy.py | 2 + src/trezor/messages/GetFeatures.py | 2 + src/trezor/messages/GetPublicKey.py | 2 + src/trezor/messages/HDNodePathType.py | 2 + src/trezor/messages/HDNodeType.py | 2 + src/trezor/messages/IdentityType.py | 2 + src/trezor/messages/Initialize.py | 2 + src/trezor/messages/InputScriptType.py | 2 + src/trezor/messages/LoadDevice.py | 2 + src/trezor/messages/MessageSignature.py | 2 + src/trezor/messages/MessageType.py | 2 + .../messages/MultisigRedeemScriptType.py | 2 + src/trezor/messages/OutputScriptType.py | 2 + src/trezor/messages/PassphraseAck.py | 2 + src/trezor/messages/PassphraseRequest.py | 2 + src/trezor/messages/PinMatrixAck.py | 2 + src/trezor/messages/PinMatrixRequest.py | 2 + src/trezor/messages/PinMatrixRequestType.py | 2 + src/trezor/messages/Ping.py | 2 + src/trezor/messages/PublicKey.py | 2 + src/trezor/messages/RecoveryDevice.py | 2 + src/trezor/messages/RecoveryDeviceType.py | 2 + src/trezor/messages/RequestType.py | 2 + src/trezor/messages/ResetDevice.py | 2 + src/trezor/messages/SetU2FCounter.py | 2 + src/trezor/messages/SignIdentity.py | 2 + src/trezor/messages/SignMessage.py | 2 + src/trezor/messages/SignTx.py | 2 + src/trezor/messages/SignedIdentity.py | 2 + src/trezor/messages/SimpleSignTx.py | 2 + src/trezor/messages/Storage.py | 2 + src/trezor/messages/Success.py | 2 + src/trezor/messages/TransactionType.py | 2 + src/trezor/messages/TxAck.py | 2 + src/trezor/messages/TxInputType.py | 2 + src/trezor/messages/TxOutputBinType.py | 2 + src/trezor/messages/TxOutputType.py | 2 + src/trezor/messages/TxRequest.py | 2 + src/trezor/messages/TxRequestDetailsType.py | 2 + .../messages/TxRequestSerializedType.py | 2 + src/trezor/messages/TxSize.py | 2 + src/trezor/messages/VerifyMessage.py | 2 + src/trezor/messages/WipeDevice.py | 2 + src/trezor/messages/WordAck.py | 2 + src/trezor/messages/WordRequest.py | 2 + src/trezor/messages/WordRequestType.py | 2 + src/trezor/messages/wire_types.py | 3 ++ src/trezor/ui/__init__.py | 2 + src/trezor/ui/pin.py | 2 +- tools/build_protobuf | 3 ++ 101 files changed, 255 insertions(+), 19 deletions(-) create mode 100644 mocks/uctypes.py create mode 100644 pylint.rc diff --git a/Makefile b/Makefile index a371b14c..5dcee7bc 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,9 @@ test: ## run unit tests testpy: ## run selected unit tests from python-trezor cd tests ; ./run_tests_python_trezor.sh +pylint: ## run pylint on application sources + pylint --rcfile=pylint.rc -E $(shell find src -name *.py) + ## build commands: build: build_boardloader build_bootloader build_firmware build_unix build_cross ## build all diff --git a/mocks/micropython.py b/mocks/micropython.py index 436f58cb..0fac1056 100644 --- a/mocks/micropython.py +++ b/mocks/micropython.py @@ -1,5 +1,5 @@ def const(c): - pass + return c def mem_info(verbose=None): pass diff --git a/mocks/ubinascii.py b/mocks/ubinascii.py index 79280af4..7dd47dc5 100644 --- a/mocks/ubinascii.py +++ b/mocks/ubinascii.py @@ -1,11 +1,14 @@ def hexlify(data, sep=None): - pass + return 0 def unhexlify(data): - pass + return 0 def a2b_base64(data): - pass + return 0 def b2a_base64(data): - pass + return 0 + +def crc32(data, crc=None): + return 0 diff --git a/mocks/uctypes.py b/mocks/uctypes.py new file mode 100644 index 00000000..dac719a6 --- /dev/null +++ b/mocks/uctypes.py @@ -0,0 +1,37 @@ +ARRAY = 0 +NATIVE = 0 +LITTLE_ENDIAN = 0 +BIG_ENDIAN = 0 +VOID = 0 +UINT8 = 0 +INT8 = 0 +UINT16 = 0 +INT16 = 0 +UINT32 = 0 +INT32 = 0 +UINT64 = 0 +INT64 = 0 +BFUINT8 = 0 +BFINT8 = 0 +BFUINT16 = 0 +BFINT16 = 0 +BFUINT32 = 0 +BFINT32 = 0 +BF_POS = 0 +BF_LEN = 0 +FLOAT32 = 0 + +def struct(addr, descriptor, layout_type=NATIVE): + return 0 + +def sizeof(struct): + return 0 + +def addressof(obj): + return 0 + +def bytes_at(addr, size): + return 0 + +def bytearray_at(addr, size): + return 0 diff --git a/mocks/ustruct.py b/mocks/ustruct.py index aae1e50f..d98dff17 100644 --- a/mocks/ustruct.py +++ b/mocks/ustruct.py @@ -1,14 +1,14 @@ def calcsize(fmt): - pass + return 0 def pack(fmt, *args): - pass + return 0 def pack_info(fmt, buffer, offset, *args): - pass + return 0 def unpack(fmt, data): - pass + return 0 def unpack_from(fmt, data, offset=0): - pass + return 0 diff --git a/mocks/utime.py b/mocks/utime.py index ad30d7cf..66c2c48c 100644 --- a/mocks/utime.py +++ b/mocks/utime.py @@ -1,11 +1,11 @@ def localtime(secs=None): - pass + return 0 def ticks_ms(): - pass + return 0 def mktime(): - pass + return 0 def sleep(seconds): pass @@ -17,16 +17,19 @@ def sleep_us(us): pass def ticks_ms(): - pass + return 0 def ticks_us(): - pass + return 0 def ticks_cpu(): - pass + return 0 + +def ticks_add(ticks_in, delta_in): + return 0 def ticks_diff(old, new): - pass + return 0 def time(): - pass + return 0 diff --git a/pylint.rc b/pylint.rc new file mode 100644 index 00000000..44ad8e37 --- /dev/null +++ b/pylint.rc @@ -0,0 +1,2 @@ +[MASTER] +init-hook='sys.path.insert(0, "mocks")' diff --git a/src/apps/fido_u2f/__init__.py b/src/apps/fido_u2f/__init__.py index 4354203f..c3d5107d 100644 --- a/src/apps/fido_u2f/__init__.py +++ b/src/apps/fido_u2f/__init__.py @@ -1,3 +1,5 @@ +from micropython import const + import uctypes import ustruct import utime diff --git a/src/main.py b/src/main.py index 0bc5100e..a1537964 100644 --- a/src/main.py +++ b/src/main.py @@ -1,3 +1,5 @@ +from micropython import const + import trezor.main from trezor import msg from trezor import ui diff --git a/src/trezor/messages/Address.py b/src/trezor/messages/Address.py index fc361ab8..5ba296d0 100644 --- a/src/trezor/messages/Address.py +++ b/src/trezor/messages/Address.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class Address(p.MessageType): diff --git a/src/trezor/messages/ApplySettings.py b/src/trezor/messages/ApplySettings.py index 83a85e53..9c47fff3 100644 --- a/src/trezor/messages/ApplySettings.py +++ b/src/trezor/messages/ApplySettings.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class ApplySettings(p.MessageType): diff --git a/src/trezor/messages/ButtonAck.py b/src/trezor/messages/ButtonAck.py index f09c192e..0d13f1b1 100644 --- a/src/trezor/messages/ButtonAck.py +++ b/src/trezor/messages/ButtonAck.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class ButtonAck(p.MessageType): diff --git a/src/trezor/messages/ButtonRequest.py b/src/trezor/messages/ButtonRequest.py index 07a1ebc3..a53d781f 100644 --- a/src/trezor/messages/ButtonRequest.py +++ b/src/trezor/messages/ButtonRequest.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class ButtonRequest(p.MessageType): diff --git a/src/trezor/messages/ButtonRequestType.py b/src/trezor/messages/ButtonRequestType.py index 779d4f63..f6b799d4 100644 --- a/src/trezor/messages/ButtonRequestType.py +++ b/src/trezor/messages/ButtonRequestType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + Other = const(1) FeeOverThreshold = const(2) ConfirmOutput = const(3) diff --git a/src/trezor/messages/Cancel.py b/src/trezor/messages/Cancel.py index bf2aa32e..cb7bf9e1 100644 --- a/src/trezor/messages/Cancel.py +++ b/src/trezor/messages/Cancel.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class Cancel(p.MessageType): diff --git a/src/trezor/messages/ChangePin.py b/src/trezor/messages/ChangePin.py index fd6e3779..4201251a 100644 --- a/src/trezor/messages/ChangePin.py +++ b/src/trezor/messages/ChangePin.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class ChangePin(p.MessageType): diff --git a/src/trezor/messages/CipherKeyValue.py b/src/trezor/messages/CipherKeyValue.py index 58fa5deb..762cf65f 100644 --- a/src/trezor/messages/CipherKeyValue.py +++ b/src/trezor/messages/CipherKeyValue.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class CipherKeyValue(p.MessageType): diff --git a/src/trezor/messages/CipheredKeyValue.py b/src/trezor/messages/CipheredKeyValue.py index b4dfeeb7..ec4edc43 100644 --- a/src/trezor/messages/CipheredKeyValue.py +++ b/src/trezor/messages/CipheredKeyValue.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class CipheredKeyValue(p.MessageType): diff --git a/src/trezor/messages/ClearSession.py b/src/trezor/messages/ClearSession.py index 84fa3345..338c75ff 100644 --- a/src/trezor/messages/ClearSession.py +++ b/src/trezor/messages/ClearSession.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class ClearSession(p.MessageType): diff --git a/src/trezor/messages/CoinType.py b/src/trezor/messages/CoinType.py index 079fe5ff..ce7b9597 100644 --- a/src/trezor/messages/CoinType.py +++ b/src/trezor/messages/CoinType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class CoinType(p.MessageType): diff --git a/src/trezor/messages/DebugLinkDecision.py b/src/trezor/messages/DebugLinkDecision.py index e57d513a..6257cabd 100644 --- a/src/trezor/messages/DebugLinkDecision.py +++ b/src/trezor/messages/DebugLinkDecision.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DebugLinkDecision(p.MessageType): diff --git a/src/trezor/messages/DebugLinkFlashErase.py b/src/trezor/messages/DebugLinkFlashErase.py index f66d0518..9a7409a8 100644 --- a/src/trezor/messages/DebugLinkFlashErase.py +++ b/src/trezor/messages/DebugLinkFlashErase.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DebugLinkFlashErase(p.MessageType): diff --git a/src/trezor/messages/DebugLinkGetState.py b/src/trezor/messages/DebugLinkGetState.py index 007e3a8c..8acabc81 100644 --- a/src/trezor/messages/DebugLinkGetState.py +++ b/src/trezor/messages/DebugLinkGetState.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DebugLinkGetState(p.MessageType): diff --git a/src/trezor/messages/DebugLinkLog.py b/src/trezor/messages/DebugLinkLog.py index 37408070..35a3f252 100644 --- a/src/trezor/messages/DebugLinkLog.py +++ b/src/trezor/messages/DebugLinkLog.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DebugLinkLog(p.MessageType): diff --git a/src/trezor/messages/DebugLinkMemory.py b/src/trezor/messages/DebugLinkMemory.py index 1f6efabc..2757d2fb 100644 --- a/src/trezor/messages/DebugLinkMemory.py +++ b/src/trezor/messages/DebugLinkMemory.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DebugLinkMemory(p.MessageType): diff --git a/src/trezor/messages/DebugLinkMemoryRead.py b/src/trezor/messages/DebugLinkMemoryRead.py index 39179a1b..27805c9c 100644 --- a/src/trezor/messages/DebugLinkMemoryRead.py +++ b/src/trezor/messages/DebugLinkMemoryRead.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DebugLinkMemoryRead(p.MessageType): diff --git a/src/trezor/messages/DebugLinkMemoryWrite.py b/src/trezor/messages/DebugLinkMemoryWrite.py index c53de2a5..bb525fbf 100644 --- a/src/trezor/messages/DebugLinkMemoryWrite.py +++ b/src/trezor/messages/DebugLinkMemoryWrite.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DebugLinkMemoryWrite(p.MessageType): diff --git a/src/trezor/messages/DebugLinkState.py b/src/trezor/messages/DebugLinkState.py index 8adf128b..a2e265d4 100644 --- a/src/trezor/messages/DebugLinkState.py +++ b/src/trezor/messages/DebugLinkState.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .HDNodeType import HDNodeType diff --git a/src/trezor/messages/DebugLinkStop.py b/src/trezor/messages/DebugLinkStop.py index 92e37c82..e113cdf5 100644 --- a/src/trezor/messages/DebugLinkStop.py +++ b/src/trezor/messages/DebugLinkStop.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DebugLinkStop(p.MessageType): diff --git a/src/trezor/messages/DecryptMessage.py b/src/trezor/messages/DecryptMessage.py index 5ef7baf1..09e7c53c 100644 --- a/src/trezor/messages/DecryptMessage.py +++ b/src/trezor/messages/DecryptMessage.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DecryptMessage(p.MessageType): diff --git a/src/trezor/messages/DecryptedMessage.py b/src/trezor/messages/DecryptedMessage.py index cdc58231..4217b3be 100644 --- a/src/trezor/messages/DecryptedMessage.py +++ b/src/trezor/messages/DecryptedMessage.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class DecryptedMessage(p.MessageType): diff --git a/src/trezor/messages/ECDHSessionKey.py b/src/trezor/messages/ECDHSessionKey.py index 61af6e49..a30cafe1 100644 --- a/src/trezor/messages/ECDHSessionKey.py +++ b/src/trezor/messages/ECDHSessionKey.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class ECDHSessionKey(p.MessageType): diff --git a/src/trezor/messages/EncryptMessage.py b/src/trezor/messages/EncryptMessage.py index 3d8ea3ce..0b0a97e9 100644 --- a/src/trezor/messages/EncryptMessage.py +++ b/src/trezor/messages/EncryptMessage.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EncryptMessage(p.MessageType): diff --git a/src/trezor/messages/EncryptedMessage.py b/src/trezor/messages/EncryptedMessage.py index c26c51df..79802d13 100644 --- a/src/trezor/messages/EncryptedMessage.py +++ b/src/trezor/messages/EncryptedMessage.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EncryptedMessage(p.MessageType): diff --git a/src/trezor/messages/Entropy.py b/src/trezor/messages/Entropy.py index b8cc4405..1f56df23 100644 --- a/src/trezor/messages/Entropy.py +++ b/src/trezor/messages/Entropy.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class Entropy(p.MessageType): diff --git a/src/trezor/messages/EntropyAck.py b/src/trezor/messages/EntropyAck.py index 1183271f..ccdb0151 100644 --- a/src/trezor/messages/EntropyAck.py +++ b/src/trezor/messages/EntropyAck.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EntropyAck(p.MessageType): diff --git a/src/trezor/messages/EntropyRequest.py b/src/trezor/messages/EntropyRequest.py index 3990dd71..176f6032 100644 --- a/src/trezor/messages/EntropyRequest.py +++ b/src/trezor/messages/EntropyRequest.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EntropyRequest(p.MessageType): diff --git a/src/trezor/messages/EstimateTxSize.py b/src/trezor/messages/EstimateTxSize.py index 6cb000d2..4272bef9 100644 --- a/src/trezor/messages/EstimateTxSize.py +++ b/src/trezor/messages/EstimateTxSize.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EstimateTxSize(p.MessageType): diff --git a/src/trezor/messages/EthereumAddress.py b/src/trezor/messages/EthereumAddress.py index 7e8dc27b..c41a1c2b 100644 --- a/src/trezor/messages/EthereumAddress.py +++ b/src/trezor/messages/EthereumAddress.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EthereumAddress(p.MessageType): diff --git a/src/trezor/messages/EthereumGetAddress.py b/src/trezor/messages/EthereumGetAddress.py index c6c0e669..fb454bed 100644 --- a/src/trezor/messages/EthereumGetAddress.py +++ b/src/trezor/messages/EthereumGetAddress.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EthereumGetAddress(p.MessageType): diff --git a/src/trezor/messages/EthereumSignTx.py b/src/trezor/messages/EthereumSignTx.py index 17d65ce4..2703337d 100644 --- a/src/trezor/messages/EthereumSignTx.py +++ b/src/trezor/messages/EthereumSignTx.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EthereumSignTx(p.MessageType): diff --git a/src/trezor/messages/EthereumTxAck.py b/src/trezor/messages/EthereumTxAck.py index 5c9683d3..67705ef4 100644 --- a/src/trezor/messages/EthereumTxAck.py +++ b/src/trezor/messages/EthereumTxAck.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EthereumTxAck(p.MessageType): diff --git a/src/trezor/messages/EthereumTxRequest.py b/src/trezor/messages/EthereumTxRequest.py index 7e07a95d..37d7008d 100644 --- a/src/trezor/messages/EthereumTxRequest.py +++ b/src/trezor/messages/EthereumTxRequest.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class EthereumTxRequest(p.MessageType): diff --git a/src/trezor/messages/Failure.py b/src/trezor/messages/Failure.py index 97e8d2a1..19118310 100644 --- a/src/trezor/messages/Failure.py +++ b/src/trezor/messages/Failure.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class Failure(p.MessageType): diff --git a/src/trezor/messages/FailureType.py b/src/trezor/messages/FailureType.py index d0eca259..6955a968 100644 --- a/src/trezor/messages/FailureType.py +++ b/src/trezor/messages/FailureType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + UnexpectedMessage = const(1) ButtonExpected = const(2) SyntaxError = const(3) diff --git a/src/trezor/messages/Features.py b/src/trezor/messages/Features.py index 865166b0..e86b4713 100644 --- a/src/trezor/messages/Features.py +++ b/src/trezor/messages/Features.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .CoinType import CoinType diff --git a/src/trezor/messages/FirmwareErase.py b/src/trezor/messages/FirmwareErase.py index 903bc7c4..a0c036e8 100644 --- a/src/trezor/messages/FirmwareErase.py +++ b/src/trezor/messages/FirmwareErase.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class FirmwareErase(p.MessageType): diff --git a/src/trezor/messages/FirmwareRequest.py b/src/trezor/messages/FirmwareRequest.py index 8a8c9a61..bb1f65d3 100644 --- a/src/trezor/messages/FirmwareRequest.py +++ b/src/trezor/messages/FirmwareRequest.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class FirmwareRequest(p.MessageType): diff --git a/src/trezor/messages/FirmwareUpload.py b/src/trezor/messages/FirmwareUpload.py index aaa4f31e..ae37d13a 100644 --- a/src/trezor/messages/FirmwareUpload.py +++ b/src/trezor/messages/FirmwareUpload.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class FirmwareUpload(p.MessageType): diff --git a/src/trezor/messages/GetAddress.py b/src/trezor/messages/GetAddress.py index b94f0da5..82fcbd87 100644 --- a/src/trezor/messages/GetAddress.py +++ b/src/trezor/messages/GetAddress.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .MultisigRedeemScriptType import MultisigRedeemScriptType diff --git a/src/trezor/messages/GetECDHSessionKey.py b/src/trezor/messages/GetECDHSessionKey.py index 650b6677..e3c8dab4 100644 --- a/src/trezor/messages/GetECDHSessionKey.py +++ b/src/trezor/messages/GetECDHSessionKey.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .IdentityType import IdentityType diff --git a/src/trezor/messages/GetEntropy.py b/src/trezor/messages/GetEntropy.py index aa5634f8..ff6f9ea1 100644 --- a/src/trezor/messages/GetEntropy.py +++ b/src/trezor/messages/GetEntropy.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class GetEntropy(p.MessageType): diff --git a/src/trezor/messages/GetFeatures.py b/src/trezor/messages/GetFeatures.py index d351cc6b..2648583e 100644 --- a/src/trezor/messages/GetFeatures.py +++ b/src/trezor/messages/GetFeatures.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class GetFeatures(p.MessageType): diff --git a/src/trezor/messages/GetPublicKey.py b/src/trezor/messages/GetPublicKey.py index e37fa5c3..5904134f 100644 --- a/src/trezor/messages/GetPublicKey.py +++ b/src/trezor/messages/GetPublicKey.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class GetPublicKey(p.MessageType): diff --git a/src/trezor/messages/HDNodePathType.py b/src/trezor/messages/HDNodePathType.py index fb835c64..1068b0c2 100644 --- a/src/trezor/messages/HDNodePathType.py +++ b/src/trezor/messages/HDNodePathType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .HDNodeType import HDNodeType diff --git a/src/trezor/messages/HDNodeType.py b/src/trezor/messages/HDNodeType.py index 89fe224c..77890983 100644 --- a/src/trezor/messages/HDNodeType.py +++ b/src/trezor/messages/HDNodeType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class HDNodeType(p.MessageType): diff --git a/src/trezor/messages/IdentityType.py b/src/trezor/messages/IdentityType.py index b628c29a..0455a145 100644 --- a/src/trezor/messages/IdentityType.py +++ b/src/trezor/messages/IdentityType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class IdentityType(p.MessageType): diff --git a/src/trezor/messages/Initialize.py b/src/trezor/messages/Initialize.py index 808c03c4..0c4cb149 100644 --- a/src/trezor/messages/Initialize.py +++ b/src/trezor/messages/Initialize.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class Initialize(p.MessageType): diff --git a/src/trezor/messages/InputScriptType.py b/src/trezor/messages/InputScriptType.py index 9e3907ec..954b7aae 100644 --- a/src/trezor/messages/InputScriptType.py +++ b/src/trezor/messages/InputScriptType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + SPENDADDRESS = const(0) SPENDMULTISIG = const(1) EXTERNAL = const(2) diff --git a/src/trezor/messages/LoadDevice.py b/src/trezor/messages/LoadDevice.py index 63bef4e9..2f272b9b 100644 --- a/src/trezor/messages/LoadDevice.py +++ b/src/trezor/messages/LoadDevice.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .HDNodeType import HDNodeType diff --git a/src/trezor/messages/MessageSignature.py b/src/trezor/messages/MessageSignature.py index 7dcd376e..3c6c7f01 100644 --- a/src/trezor/messages/MessageSignature.py +++ b/src/trezor/messages/MessageSignature.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class MessageSignature(p.MessageType): diff --git a/src/trezor/messages/MessageType.py b/src/trezor/messages/MessageType.py index 927f5a0e..68709426 100644 --- a/src/trezor/messages/MessageType.py +++ b/src/trezor/messages/MessageType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + Initialize = const(0) Ping = const(1) Success = const(2) diff --git a/src/trezor/messages/MultisigRedeemScriptType.py b/src/trezor/messages/MultisigRedeemScriptType.py index fe56d291..c06f0a6e 100644 --- a/src/trezor/messages/MultisigRedeemScriptType.py +++ b/src/trezor/messages/MultisigRedeemScriptType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .HDNodePathType import HDNodePathType diff --git a/src/trezor/messages/OutputScriptType.py b/src/trezor/messages/OutputScriptType.py index 4551a68a..5b0f1d28 100644 --- a/src/trezor/messages/OutputScriptType.py +++ b/src/trezor/messages/OutputScriptType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + PAYTOADDRESS = const(0) PAYTOSCRIPTHASH = const(1) PAYTOMULTISIG = const(2) diff --git a/src/trezor/messages/PassphraseAck.py b/src/trezor/messages/PassphraseAck.py index 759a21cc..db33e825 100644 --- a/src/trezor/messages/PassphraseAck.py +++ b/src/trezor/messages/PassphraseAck.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class PassphraseAck(p.MessageType): diff --git a/src/trezor/messages/PassphraseRequest.py b/src/trezor/messages/PassphraseRequest.py index e973e247..7d3976b7 100644 --- a/src/trezor/messages/PassphraseRequest.py +++ b/src/trezor/messages/PassphraseRequest.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class PassphraseRequest(p.MessageType): diff --git a/src/trezor/messages/PinMatrixAck.py b/src/trezor/messages/PinMatrixAck.py index 8032777a..db318827 100644 --- a/src/trezor/messages/PinMatrixAck.py +++ b/src/trezor/messages/PinMatrixAck.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class PinMatrixAck(p.MessageType): diff --git a/src/trezor/messages/PinMatrixRequest.py b/src/trezor/messages/PinMatrixRequest.py index 58f7b803..8a739911 100644 --- a/src/trezor/messages/PinMatrixRequest.py +++ b/src/trezor/messages/PinMatrixRequest.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class PinMatrixRequest(p.MessageType): diff --git a/src/trezor/messages/PinMatrixRequestType.py b/src/trezor/messages/PinMatrixRequestType.py index 2fba5c90..9380b49b 100644 --- a/src/trezor/messages/PinMatrixRequestType.py +++ b/src/trezor/messages/PinMatrixRequestType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + Current = const(1) NewFirst = const(2) NewSecond = const(3) diff --git a/src/trezor/messages/Ping.py b/src/trezor/messages/Ping.py index 88372321..6ee6be7e 100644 --- a/src/trezor/messages/Ping.py +++ b/src/trezor/messages/Ping.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class Ping(p.MessageType): diff --git a/src/trezor/messages/PublicKey.py b/src/trezor/messages/PublicKey.py index 4b91d6cf..98f81d40 100644 --- a/src/trezor/messages/PublicKey.py +++ b/src/trezor/messages/PublicKey.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .HDNodeType import HDNodeType diff --git a/src/trezor/messages/RecoveryDevice.py b/src/trezor/messages/RecoveryDevice.py index f0d07d05..7706ca76 100644 --- a/src/trezor/messages/RecoveryDevice.py +++ b/src/trezor/messages/RecoveryDevice.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class RecoveryDevice(p.MessageType): diff --git a/src/trezor/messages/RecoveryDeviceType.py b/src/trezor/messages/RecoveryDeviceType.py index 0223a03f..0416a4d0 100644 --- a/src/trezor/messages/RecoveryDeviceType.py +++ b/src/trezor/messages/RecoveryDeviceType.py @@ -1,3 +1,5 @@ # Automatically generated by pb2py +from micropython import const + ScrambledWords = const(0) Matrix = const(1) diff --git a/src/trezor/messages/RequestType.py b/src/trezor/messages/RequestType.py index 3140f308..4ce14db4 100644 --- a/src/trezor/messages/RequestType.py +++ b/src/trezor/messages/RequestType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + TXINPUT = const(0) TXOUTPUT = const(1) TXMETA = const(2) diff --git a/src/trezor/messages/ResetDevice.py b/src/trezor/messages/ResetDevice.py index fca19d50..81bce11c 100644 --- a/src/trezor/messages/ResetDevice.py +++ b/src/trezor/messages/ResetDevice.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class ResetDevice(p.MessageType): diff --git a/src/trezor/messages/SetU2FCounter.py b/src/trezor/messages/SetU2FCounter.py index cb5e0392..d72a3ce4 100644 --- a/src/trezor/messages/SetU2FCounter.py +++ b/src/trezor/messages/SetU2FCounter.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class SetU2FCounter(p.MessageType): diff --git a/src/trezor/messages/SignIdentity.py b/src/trezor/messages/SignIdentity.py index 55b01b95..63620c63 100644 --- a/src/trezor/messages/SignIdentity.py +++ b/src/trezor/messages/SignIdentity.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .IdentityType import IdentityType diff --git a/src/trezor/messages/SignMessage.py b/src/trezor/messages/SignMessage.py index 17a1e86a..a11774b1 100644 --- a/src/trezor/messages/SignMessage.py +++ b/src/trezor/messages/SignMessage.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class SignMessage(p.MessageType): diff --git a/src/trezor/messages/SignTx.py b/src/trezor/messages/SignTx.py index 870865cc..34cc42ac 100644 --- a/src/trezor/messages/SignTx.py +++ b/src/trezor/messages/SignTx.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class SignTx(p.MessageType): diff --git a/src/trezor/messages/SignedIdentity.py b/src/trezor/messages/SignedIdentity.py index 72402427..f9735b57 100644 --- a/src/trezor/messages/SignedIdentity.py +++ b/src/trezor/messages/SignedIdentity.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class SignedIdentity(p.MessageType): diff --git a/src/trezor/messages/SimpleSignTx.py b/src/trezor/messages/SimpleSignTx.py index d56d5f8d..93704e57 100644 --- a/src/trezor/messages/SimpleSignTx.py +++ b/src/trezor/messages/SimpleSignTx.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .TxInputType import TxInputType from .TxOutputType import TxOutputType diff --git a/src/trezor/messages/Storage.py b/src/trezor/messages/Storage.py index e934d753..dbf1da13 100644 --- a/src/trezor/messages/Storage.py +++ b/src/trezor/messages/Storage.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .HDNodeType import HDNodeType diff --git a/src/trezor/messages/Success.py b/src/trezor/messages/Success.py index 5826b55d..dc9f9c7e 100644 --- a/src/trezor/messages/Success.py +++ b/src/trezor/messages/Success.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class Success(p.MessageType): diff --git a/src/trezor/messages/TransactionType.py b/src/trezor/messages/TransactionType.py index f51f80bc..efbda48d 100644 --- a/src/trezor/messages/TransactionType.py +++ b/src/trezor/messages/TransactionType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .TxInputType import TxInputType from .TxOutputBinType import TxOutputBinType diff --git a/src/trezor/messages/TxAck.py b/src/trezor/messages/TxAck.py index 5e53e764..fe720e13 100644 --- a/src/trezor/messages/TxAck.py +++ b/src/trezor/messages/TxAck.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .TransactionType import TransactionType diff --git a/src/trezor/messages/TxInputType.py b/src/trezor/messages/TxInputType.py index 6611608b..c44008e2 100644 --- a/src/trezor/messages/TxInputType.py +++ b/src/trezor/messages/TxInputType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .MultisigRedeemScriptType import MultisigRedeemScriptType diff --git a/src/trezor/messages/TxOutputBinType.py b/src/trezor/messages/TxOutputBinType.py index 4e47f71a..ce6da039 100644 --- a/src/trezor/messages/TxOutputBinType.py +++ b/src/trezor/messages/TxOutputBinType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class TxOutputBinType(p.MessageType): diff --git a/src/trezor/messages/TxOutputType.py b/src/trezor/messages/TxOutputType.py index 26f657bb..30215018 100644 --- a/src/trezor/messages/TxOutputType.py +++ b/src/trezor/messages/TxOutputType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .MultisigRedeemScriptType import MultisigRedeemScriptType diff --git a/src/trezor/messages/TxRequest.py b/src/trezor/messages/TxRequest.py index a93fd500..469e9a17 100644 --- a/src/trezor/messages/TxRequest.py +++ b/src/trezor/messages/TxRequest.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p from .TxRequestDetailsType import TxRequestDetailsType from .TxRequestSerializedType import TxRequestSerializedType diff --git a/src/trezor/messages/TxRequestDetailsType.py b/src/trezor/messages/TxRequestDetailsType.py index 5917ae17..ee8f340f 100644 --- a/src/trezor/messages/TxRequestDetailsType.py +++ b/src/trezor/messages/TxRequestDetailsType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class TxRequestDetailsType(p.MessageType): diff --git a/src/trezor/messages/TxRequestSerializedType.py b/src/trezor/messages/TxRequestSerializedType.py index 3fb53451..5cc7445e 100644 --- a/src/trezor/messages/TxRequestSerializedType.py +++ b/src/trezor/messages/TxRequestSerializedType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class TxRequestSerializedType(p.MessageType): diff --git a/src/trezor/messages/TxSize.py b/src/trezor/messages/TxSize.py index 5049fbde..d092ff9e 100644 --- a/src/trezor/messages/TxSize.py +++ b/src/trezor/messages/TxSize.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class TxSize(p.MessageType): diff --git a/src/trezor/messages/VerifyMessage.py b/src/trezor/messages/VerifyMessage.py index da3689e1..08e5bcf6 100644 --- a/src/trezor/messages/VerifyMessage.py +++ b/src/trezor/messages/VerifyMessage.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class VerifyMessage(p.MessageType): diff --git a/src/trezor/messages/WipeDevice.py b/src/trezor/messages/WipeDevice.py index c267caa4..71b42290 100644 --- a/src/trezor/messages/WipeDevice.py +++ b/src/trezor/messages/WipeDevice.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class WipeDevice(p.MessageType): diff --git a/src/trezor/messages/WordAck.py b/src/trezor/messages/WordAck.py index 89271b74..5f04f326 100644 --- a/src/trezor/messages/WordAck.py +++ b/src/trezor/messages/WordAck.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class WordAck(p.MessageType): diff --git a/src/trezor/messages/WordRequest.py b/src/trezor/messages/WordRequest.py index 763bc88f..5077ff7b 100644 --- a/src/trezor/messages/WordRequest.py +++ b/src/trezor/messages/WordRequest.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + import protobuf as p class WordRequest(p.MessageType): diff --git a/src/trezor/messages/WordRequestType.py b/src/trezor/messages/WordRequestType.py index e0baf376..2c646605 100644 --- a/src/trezor/messages/WordRequestType.py +++ b/src/trezor/messages/WordRequestType.py @@ -1,4 +1,6 @@ # Automatically generated by pb2py +from micropython import const + Plain = const(0) Matrix9 = const(1) Matrix6 = const(2) diff --git a/src/trezor/messages/wire_types.py b/src/trezor/messages/wire_types.py index ad84d311..3d9bf0c0 100644 --- a/src/trezor/messages/wire_types.py +++ b/src/trezor/messages/wire_types.py @@ -1,3 +1,6 @@ +# Automatically generated by pb2py +from micropython import const + WordRequest = const(46) DebugLinkMemoryWrite = const(112) ButtonAck = const(27) diff --git a/src/trezor/ui/__init__.py b/src/trezor/ui/__init__.py index 10675faa..3d769d75 100644 --- a/src/trezor/ui/__init__.py +++ b/src/trezor/ui/__init__.py @@ -1,3 +1,5 @@ +from micropython import const + import sys import math import utime diff --git a/src/trezor/ui/pin.py b/src/trezor/ui/pin.py index 7c4f7995..967df753 100644 --- a/src/trezor/ui/pin.py +++ b/src/trezor/ui/pin.py @@ -2,7 +2,7 @@ from micropython import const from trezor import ui, res from trezor.crypto import random from trezor.ui import display -from treozr.ui.button import Button, BTN_CLICKED, CLEAR_BUTTON, CLEAR_BUTTON_ACTIVE +from trezor.ui.button import Button, BTN_CLICKED, CLEAR_BUTTON, CLEAR_BUTTON_ACTIVE def digit_area(i): diff --git a/tools/build_protobuf b/tools/build_protobuf index d76dca13..627b74fa 100755 --- a/tools/build_protobuf +++ b/tools/build_protobuf @@ -5,6 +5,9 @@ echo > $CURDIR/pb2/__init__.py INDEX=../src/trezor/messages/wire_types.py rm -f $INDEX +echo '# Automatically generated by pb2py' >> $INDEX +echo 'from micropython import const' >> $INDEX +echo '' >> $INDEX for i in types messages storage ; do # Compile .proto files to python2 modules using google protobuf library