arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-05 08:29:13 +00:00
Code Issues Releases Wiki Activity

chore: unify FailureType enum across branches

Browse Source
This commit is contained in:
M1nd3r 2025-03-21 13:51:56 +01:00
parent 473210831c
commit 0d92e79ba2
6 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/protob/messages-common.proto
View File

@ -39,10 +39,10 @@ message Failure {
Failure_PinMismatch = 12; Failure_PinMismatch = 12;
Failure_WipeCodeMismatch = 13; Failure_WipeCodeMismatch = 13;
Failure_InvalidSession = 14; Failure_InvalidSession = 14;
Failure_ThpUnallocatedSession = 15; Failure_DeviceIsBusy = 15;
Failure_InvalidProtocol = 16; Failure_ThpUnallocatedSession = 16;
Failure_BufferError = 17; Failure_InvalidProtocol = 17;
Failure_DeviceIsBusy = 18; Failure_BufferError = 18;
Failure_FirmwareError = 99; Failure_FirmwareError = 99;
} }
} }

8
core/src/trezor/enums/FailureType.py generated
View File

@ -16,8 +16,8 @@ NotInitialized = 11
PinMismatch = 12 PinMismatch = 12
WipeCodeMismatch = 13 WipeCodeMismatch = 13
InvalidSession = 14 InvalidSession = 14
ThpUnallocatedSession = 15 DeviceIsBusy = 15
InvalidProtocol = 16 ThpUnallocatedSession = 16
BufferError = 17 InvalidProtocol = 17
DeviceIsBusy = 18 BufferError = 18
FirmwareError = 99 FirmwareError = 99

8
core/src/trezor/enums/__init__.py generated
View File

@ -39,10 +39,10 @@ if TYPE_CHECKING:
PinMismatch = 12 PinMismatch = 12
WipeCodeMismatch = 13 WipeCodeMismatch = 13
InvalidSession = 14 InvalidSession = 14
ThpUnallocatedSession = 15 DeviceIsBusy = 15
InvalidProtocol = 16 ThpUnallocatedSession = 16
BufferError = 17 InvalidProtocol = 17
DeviceIsBusy = 18 BufferError = 18
FirmwareError = 99 FirmwareError = 99
class ButtonRequestType(IntEnum): class ButtonRequestType(IntEnum):

2
core/src/trezor/wire/thp/thp_main.py
View File

@ -161,5 +161,5 @@ def _get_ctrl_byte(packet: bytes) -> int:
def _get_codec_v1_error_message() -> bytes: def _get_codec_v1_error_message() -> bytes:
# Codec_v1 magic constant "?##" + Failure message type + msg_size # Codec_v1 magic constant "?##" + Failure message type + msg_size
# + msg_data (code = "Failure_InvalidProtocol") + padding to 64 B # + msg_data (code = "Failure_InvalidProtocol") + padding to 64 B
ERROR_MSG = b"\x3f\x23\x23\x00\x03\x00\x00\x00\x14\x08\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" ERROR_MSG = b"\x3f\x23\x23\x00\x03\x00\x00\x00\x14\x08\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
return ERROR_MSG return ERROR_MSG

8
python/src/trezorlib/messages.py generated
View File

@ -43,10 +43,10 @@ class FailureType(IntEnum):
PinMismatch = 12 PinMismatch = 12
WipeCodeMismatch = 13 WipeCodeMismatch = 13
InvalidSession = 14 InvalidSession = 14
ThpUnallocatedSession = 15 DeviceIsBusy = 15
InvalidProtocol = 16 ThpUnallocatedSession = 16
BufferError = 17 InvalidProtocol = 17
DeviceIsBusy = 18 BufferError = 18
FirmwareError = 99 FirmwareError = 99

42
rust/trezor-client/src/protos/generated/messages_common.rs generated
View File

@ -414,14 +414,14 @@ pub mod failure {
Failure_WipeCodeMismatch = 13, Failure_WipeCodeMismatch = 13,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_InvalidSession) // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_InvalidSession)
Failure_InvalidSession = 14, Failure_InvalidSession = 14,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_ThpUnallocatedSession)
Failure_ThpUnallocatedSession = 15,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_InvalidProtocol)
Failure_InvalidProtocol = 16,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_BufferError)
Failure_BufferError = 17,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_DeviceIsBusy) // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_DeviceIsBusy)
Failure_DeviceIsBusy = 18, Failure_DeviceIsBusy = 15,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_ThpUnallocatedSession)
Failure_ThpUnallocatedSession = 16,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_InvalidProtocol)
Failure_InvalidProtocol = 17,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_BufferError)
Failure_BufferError = 18,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_FirmwareError) // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_FirmwareError)
Failure_FirmwareError = 99, Failure_FirmwareError = 99,
} }
@ -449,10 +449,10 @@ pub mod failure {
12 => ::std::option::Option::Some(FailureType::Failure_PinMismatch), 12 => ::std::option::Option::Some(FailureType::Failure_PinMismatch),
13 => ::std::option::Option::Some(FailureType::Failure_WipeCodeMismatch), 13 => ::std::option::Option::Some(FailureType::Failure_WipeCodeMismatch),
14 => ::std::option::Option::Some(FailureType::Failure_InvalidSession), 14 => ::std::option::Option::Some(FailureType::Failure_InvalidSession),
15 => ::std::option::Option::Some(FailureType::Failure_ThpUnallocatedSession), 15 => ::std::option::Option::Some(FailureType::Failure_DeviceIsBusy),
16 => ::std::option::Option::Some(FailureType::Failure_InvalidProtocol), 16 => ::std::option::Option::Some(FailureType::Failure_ThpUnallocatedSession),
17 => ::std::option::Option::Some(FailureType::Failure_BufferError), 17 => ::std::option::Option::Some(FailureType::Failure_InvalidProtocol),
18 => ::std::option::Option::Some(FailureType::Failure_DeviceIsBusy), 18 => ::std::option::Option::Some(FailureType::Failure_BufferError),
99 => ::std::option::Option::Some(FailureType::Failure_FirmwareError), 99 => ::std::option::Option::Some(FailureType::Failure_FirmwareError),
_ => ::std::option::Option::None _ => ::std::option::Option::None
} }
@ -474,10 +474,10 @@ pub mod failure {
"Failure_PinMismatch" => ::std::option::Option::Some(FailureType::Failure_PinMismatch), "Failure_PinMismatch" => ::std::option::Option::Some(FailureType::Failure_PinMismatch),
"Failure_WipeCodeMismatch" => ::std::option::Option::Some(FailureType::Failure_WipeCodeMismatch), "Failure_WipeCodeMismatch" => ::std::option::Option::Some(FailureType::Failure_WipeCodeMismatch),
"Failure_InvalidSession" => ::std::option::Option::Some(FailureType::Failure_InvalidSession), "Failure_InvalidSession" => ::std::option::Option::Some(FailureType::Failure_InvalidSession),
"Failure_DeviceIsBusy" => ::std::option::Option::Some(FailureType::Failure_DeviceIsBusy),
"Failure_ThpUnallocatedSession" => ::std::option::Option::Some(FailureType::Failure_ThpUnallocatedSession), "Failure_ThpUnallocatedSession" => ::std::option::Option::Some(FailureType::Failure_ThpUnallocatedSession),
"Failure_InvalidProtocol" => ::std::option::Option::Some(FailureType::Failure_InvalidProtocol), "Failure_InvalidProtocol" => ::std::option::Option::Some(FailureType::Failure_InvalidProtocol),
"Failure_BufferError" => ::std::option::Option::Some(FailureType::Failure_BufferError), "Failure_BufferError" => ::std::option::Option::Some(FailureType::Failure_BufferError),
"Failure_DeviceIsBusy" => ::std::option::Option::Some(FailureType::Failure_DeviceIsBusy),
"Failure_FirmwareError" => ::std::option::Option::Some(FailureType::Failure_FirmwareError), "Failure_FirmwareError" => ::std::option::Option::Some(FailureType::Failure_FirmwareError),
_ => ::std::option::Option::None _ => ::std::option::Option::None
} }
@ -498,10 +498,10 @@ pub mod failure {
FailureType::Failure_PinMismatch, FailureType::Failure_PinMismatch,
FailureType::Failure_WipeCodeMismatch, FailureType::Failure_WipeCodeMismatch,
FailureType::Failure_InvalidSession, FailureType::Failure_InvalidSession,
FailureType::Failure_DeviceIsBusy,
FailureType::Failure_ThpUnallocatedSession, FailureType::Failure_ThpUnallocatedSession,
FailureType::Failure_InvalidProtocol, FailureType::Failure_InvalidProtocol,
FailureType::Failure_BufferError, FailureType::Failure_BufferError,
FailureType::Failure_DeviceIsBusy,
FailureType::Failure_FirmwareError, FailureType::Failure_FirmwareError,
]; ];
} }
@ -528,10 +528,10 @@ pub mod failure {
FailureType::Failure_PinMismatch => 11, FailureType::Failure_PinMismatch => 11,
FailureType::Failure_WipeCodeMismatch => 12, FailureType::Failure_WipeCodeMismatch => 12,
FailureType::Failure_InvalidSession => 13, FailureType::Failure_InvalidSession => 13,
FailureType::Failure_ThpUnallocatedSession => 14, FailureType::Failure_DeviceIsBusy => 14,
FailureType::Failure_InvalidProtocol => 15, FailureType::Failure_ThpUnallocatedSession => 15,
FailureType::Failure_BufferError => 16, FailureType::Failure_InvalidProtocol => 16,
FailureType::Failure_DeviceIsBusy => 17, FailureType::Failure_BufferError => 17,
FailureType::Failure_FirmwareError => 18, FailureType::Failure_FirmwareError => 18,
}; };
Self::enum_descriptor().value_by_index(index) Self::enum_descriptor().value_by_index(index)
@ -2516,10 +2516,10 @@ static file_descriptor_proto_data: &'static [u8] = b"\
essError\x10\t\x12\x1a\n\x16Failure_NotEnoughFunds\x10\n\x12\x1a\n\x16Fa\ essError\x10\t\x12\x1a\n\x16Failure_NotEnoughFunds\x10\n\x12\x1a\n\x16Fa\
ilure_NotInitialized\x10\x0b\x12\x17\n\x13Failure_PinMismatch\x10\x0c\ ilure_NotInitialized\x10\x0b\x12\x17\n\x13Failure_PinMismatch\x10\x0c\
\x12\x1c\n\x18Failure_WipeCodeMismatch\x10\r\x12\x1a\n\x16Failure_Invali\ \x12\x1c\n\x18Failure_WipeCodeMismatch\x10\r\x12\x1a\n\x16Failure_Invali\
dSession\x10\x0e\x12!\n\x1dFailure_ThpUnallocatedSession\x10\x0f\x12\x1b\ dSession\x10\x0e\x12\x18\n\x14Failure_DeviceIsBusy\x10\x0f\x12!\n\x1dFai\
\n\x17Failure_InvalidProtocol\x10\x10\x12\x17\n\x13Failure_BufferError\ lure_ThpUnallocatedSession\x10\x10\x12\x1b\n\x17Failure_InvalidProtocol\
\x10\x11\x12\x18\n\x14Failure_DeviceIsBusy\x10\x12\x12\x19\n\x15Failure_\ \x10\x11\x12\x17\n\x13Failure_BufferError\x10\x12\x12\x19\n\x15Failure_F\
FirmwareError\x10c\"\xab\x06\n\rButtonRequest\x12N\n\x04code\x18\x01\x20\ irmwareError\x10c\"\xab\x06\n\rButtonRequest\x12N\n\x04code\x18\x01\x20\
\x01(\x0e2:.hw.trezor.messages.common.ButtonRequest.ButtonRequestTypeR\ \x01(\x0e2:.hw.trezor.messages.common.ButtonRequest.ButtonRequestTypeR\
\x04code\x12\x14\n\x05pages\x18\x02\x20\x01(\rR\x05pages\x12\x12\n\x04na\ \x04code\x12\x14\n\x05pages\x18\x02\x20\x01(\rR\x05pages\x12\x12\n\x04na\
me\x18\x04\x20\x01(\tR\x04name\"\x99\x05\n\x11ButtonRequestType\x12\x17\ me\x18\x04\x20\x01(\tR\x04name\"\x99\x05\n\x11ButtonRequestType\x12\x17\