From 0bb57173db8d0544f85bb8959148c59067c332f7 Mon Sep 17 00:00:00 2001 From: matejcik Date: Fri, 2 Feb 2024 14:35:42 +0100 Subject: [PATCH] chore(common): remove useless proto imports --- common/protob/messages-bootloader.proto | 2 - common/protob/messages-solana.proto | 2 - common/protob/messages-webauthn.proto | 2 - .../protos/generated/messages_bootloader.rs | 19 ++++----- .../src/protos/generated/messages_solana.rs | 41 +++++++++---------- .../src/protos/generated/messages_webauthn.rs | 38 ++++++++--------- 6 files changed, 47 insertions(+), 57 deletions(-) diff --git a/common/protob/messages-bootloader.proto b/common/protob/messages-bootloader.proto index fc13fe4249..f41d9cb913 100644 --- a/common/protob/messages-bootloader.proto +++ b/common/protob/messages-bootloader.proto @@ -5,8 +5,6 @@ package hw.trezor.messages.bootloader; option java_package = "com.satoshilabs.trezor.lib.protobuf"; option java_outer_classname = "TrezorMessageBootloader"; -import "messages.proto"; - /** * Request: Ask device to erase its firmware (so it can be replaced via FirmwareUpload) * @start diff --git a/common/protob/messages-solana.proto b/common/protob/messages-solana.proto index 39bdfa43a2..2132a76d17 100644 --- a/common/protob/messages-solana.proto +++ b/common/protob/messages-solana.proto @@ -1,8 +1,6 @@ syntax = "proto2"; package hw.trezor.messages.solana; -import "messages-common.proto"; - /** * Request: Ask device for public key corresponding to address_n path * @start diff --git a/common/protob/messages-webauthn.proto b/common/protob/messages-webauthn.proto index 76871abc65..10bf4604d9 100644 --- a/common/protob/messages-webauthn.proto +++ b/common/protob/messages-webauthn.proto @@ -5,8 +5,6 @@ package hw.trezor.messages.webauthn; option java_package = "com.satoshilabs.trezor.lib.protobuf"; option java_outer_classname = "TrezorMessageWebAuthn"; -import "messages.proto"; - /** * Request: List resident credentials * @start diff --git a/rust/trezor-client/src/protos/generated/messages_bootloader.rs b/rust/trezor-client/src/protos/generated/messages_bootloader.rs index 6c328a1730..17c9331188 100644 --- a/rust/trezor-client/src/protos/generated/messages_bootloader.rs +++ b/rust/trezor-client/src/protos/generated/messages_bootloader.rs @@ -724,14 +724,14 @@ impl ::protobuf::reflect::ProtobufValue for SelfTest { } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x19messages-bootloader.proto\x12\x1dhw.trezor.messages.bootloader\x1a\ - \x0emessages.proto\"'\n\rFirmwareErase\x12\x16\n\x06length\x18\x01\x20\ - \x01(\rR\x06length\"A\n\x0fFirmwareRequest\x12\x16\n\x06offset\x18\x01\ - \x20\x02(\rR\x06offset\x12\x16\n\x06length\x18\x02\x20\x02(\rR\x06length\ - \">\n\x0eFirmwareUpload\x12\x18\n\x07payload\x18\x01\x20\x02(\x0cR\x07pa\ - yload\x12\x12\n\x04hash\x18\x02\x20\x01(\x0cR\x04hash\"$\n\x08SelfTest\ - \x12\x18\n\x07payload\x18\x01\x20\x01(\x0cR\x07payloadB>\n#com.satoshila\ - bs.trezor.lib.protobufB\x17TrezorMessageBootloader\ + \n\x19messages-bootloader.proto\x12\x1dhw.trezor.messages.bootloader\"'\ + \n\rFirmwareErase\x12\x16\n\x06length\x18\x01\x20\x01(\rR\x06length\"A\n\ + \x0fFirmwareRequest\x12\x16\n\x06offset\x18\x01\x20\x02(\rR\x06offset\ + \x12\x16\n\x06length\x18\x02\x20\x02(\rR\x06length\">\n\x0eFirmwareUploa\ + d\x12\x18\n\x07payload\x18\x01\x20\x02(\x0cR\x07payload\x12\x12\n\x04has\ + h\x18\x02\x20\x01(\x0cR\x04hash\"$\n\x08SelfTest\x12\x18\n\x07payload\ + \x18\x01\x20\x01(\x0cR\x07payloadB>\n#com.satoshilabs.trezor.lib.protobu\ + fB\x17TrezorMessageBootloader\ "; /// `FileDescriptorProto` object which was a source for this generated file @@ -748,8 +748,7 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { static file_descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::FileDescriptor> = ::protobuf::rt::Lazy::new(); file_descriptor.get(|| { let generated_file_descriptor = generated_file_descriptor_lazy.get(|| { - let mut deps = ::std::vec::Vec::with_capacity(1); - deps.push(super::messages::file_descriptor().clone()); + let mut deps = ::std::vec::Vec::with_capacity(0); let mut messages = ::std::vec::Vec::with_capacity(4); messages.push(FirmwareErase::generated_message_descriptor_data()); messages.push(FirmwareRequest::generated_message_descriptor_data()); diff --git a/rust/trezor-client/src/protos/generated/messages_solana.rs b/rust/trezor-client/src/protos/generated/messages_solana.rs index d00ba1e86f..2531e9c47b 100644 --- a/rust/trezor-client/src/protos/generated/messages_solana.rs +++ b/rust/trezor-client/src/protos/generated/messages_solana.rs @@ -1536,25 +1536,25 @@ impl ::protobuf::reflect::ProtobufValue for SolanaTxSignature { } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x15messages-solana.proto\x12\x19hw.trezor.messages.solana\x1a\x15mess\ - ages-common.proto\"T\n\x12SolanaGetPublicKey\x12\x1b\n\taddress_n\x18\ - \x01\x20\x03(\rR\x08addressN\x12!\n\x0cshow_display\x18\x02\x20\x01(\x08\ - R\x0bshowDisplay\"0\n\x0fSolanaPublicKey\x12\x1d\n\npublic_key\x18\x01\ - \x20\x02(\x0cR\tpublicKey\"n\n\x10SolanaGetAddress\x12\x1b\n\taddress_n\ - \x18\x01\x20\x03(\rR\x08addressN\x12!\n\x0cshow_display\x18\x02\x20\x01(\ - \x08R\x0bshowDisplay\x12\x1a\n\x08chunkify\x18\x03\x20\x01(\x08R\x08chun\ - kify\")\n\rSolanaAddress\x12\x18\n\x07address\x18\x01\x20\x02(\tR\x07add\ - ress\"\xa6\x01\n\x18SolanaTxTokenAccountInfo\x12!\n\x0cbase_address\x18\ - \x01\x20\x02(\tR\x0bbaseAddress\x12#\n\rtoken_program\x18\x02\x20\x02(\t\ - R\x0ctokenProgram\x12\x1d\n\ntoken_mint\x18\x03\x20\x02(\tR\ttokenMint\ - \x12#\n\rtoken_account\x18\x04\x20\x02(\tR\x0ctokenAccount\"\x7f\n\x16So\ - lanaTxAdditionalInfo\x12e\n\x14token_accounts_infos\x18\x01\x20\x03(\x0b\ - 23.hw.trezor.messages.solana.SolanaTxTokenAccountInfoR\x12tokenAccountsI\ - nfos\"\xac\x01\n\x0cSolanaSignTx\x12\x1b\n\taddress_n\x18\x01\x20\x03(\r\ - R\x08addressN\x12#\n\rserialized_tx\x18\x02\x20\x02(\x0cR\x0cserializedT\ - x\x12Z\n\x0fadditional_info\x18\x03\x20\x01(\x0b21.hw.trezor.messages.so\ - lana.SolanaTxAdditionalInfoR\x0eadditionalInfo\"1\n\x11SolanaTxSignature\ - \x12\x1c\n\tsignature\x18\x01\x20\x02(\x0cR\tsignature\ + \n\x15messages-solana.proto\x12\x19hw.trezor.messages.solana\"T\n\x12Sol\ + anaGetPublicKey\x12\x1b\n\taddress_n\x18\x01\x20\x03(\rR\x08addressN\x12\ + !\n\x0cshow_display\x18\x02\x20\x01(\x08R\x0bshowDisplay\"0\n\x0fSolanaP\ + ublicKey\x12\x1d\n\npublic_key\x18\x01\x20\x02(\x0cR\tpublicKey\"n\n\x10\ + SolanaGetAddress\x12\x1b\n\taddress_n\x18\x01\x20\x03(\rR\x08addressN\ + \x12!\n\x0cshow_display\x18\x02\x20\x01(\x08R\x0bshowDisplay\x12\x1a\n\ + \x08chunkify\x18\x03\x20\x01(\x08R\x08chunkify\")\n\rSolanaAddress\x12\ + \x18\n\x07address\x18\x01\x20\x02(\tR\x07address\"\xa6\x01\n\x18SolanaTx\ + TokenAccountInfo\x12!\n\x0cbase_address\x18\x01\x20\x02(\tR\x0bbaseAddre\ + ss\x12#\n\rtoken_program\x18\x02\x20\x02(\tR\x0ctokenProgram\x12\x1d\n\n\ + token_mint\x18\x03\x20\x02(\tR\ttokenMint\x12#\n\rtoken_account\x18\x04\ + \x20\x02(\tR\x0ctokenAccount\"\x7f\n\x16SolanaTxAdditionalInfo\x12e\n\ + \x14token_accounts_infos\x18\x01\x20\x03(\x0b23.hw.trezor.messages.solan\ + a.SolanaTxTokenAccountInfoR\x12tokenAccountsInfos\"\xac\x01\n\x0cSolanaS\ + ignTx\x12\x1b\n\taddress_n\x18\x01\x20\x03(\rR\x08addressN\x12#\n\rseria\ + lized_tx\x18\x02\x20\x02(\x0cR\x0cserializedTx\x12Z\n\x0fadditional_info\ + \x18\x03\x20\x01(\x0b21.hw.trezor.messages.solana.SolanaTxAdditionalInfo\ + R\x0eadditionalInfo\"1\n\x11SolanaTxSignature\x12\x1c\n\tsignature\x18\ + \x01\x20\x02(\x0cR\tsignature\ "; /// `FileDescriptorProto` object which was a source for this generated file @@ -1571,8 +1571,7 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { static file_descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::FileDescriptor> = ::protobuf::rt::Lazy::new(); file_descriptor.get(|| { let generated_file_descriptor = generated_file_descriptor_lazy.get(|| { - let mut deps = ::std::vec::Vec::with_capacity(1); - deps.push(super::messages_common::file_descriptor().clone()); + let mut deps = ::std::vec::Vec::with_capacity(0); let mut messages = ::std::vec::Vec::with_capacity(8); messages.push(SolanaGetPublicKey::generated_message_descriptor_data()); messages.push(SolanaPublicKey::generated_message_descriptor_data()); diff --git a/rust/trezor-client/src/protos/generated/messages_webauthn.rs b/rust/trezor-client/src/protos/generated/messages_webauthn.rs index 7de0714c18..3f9e0c0b92 100644 --- a/rust/trezor-client/src/protos/generated/messages_webauthn.rs +++ b/rust/trezor-client/src/protos/generated/messages_webauthn.rs @@ -1204,24 +1204,23 @@ pub mod web_authn_credentials { } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x17messages-webauthn.proto\x12\x1bhw.trezor.messages.webauthn\x1a\x0e\ - messages.proto\"!\n\x1fWebAuthnListResidentCredentials\"D\n\x1dWebAuthnA\ - ddResidentCredential\x12#\n\rcredential_id\x18\x01\x20\x01(\x0cR\x0ccred\ - entialId\"8\n\x20WebAuthnRemoveResidentCredential\x12\x14\n\x05index\x18\ - \x01\x20\x01(\rR\x05index\"\xe9\x03\n\x13WebAuthnCredentials\x12e\n\x0bc\ - redentials\x18\x01\x20\x03(\x0b2C.hw.trezor.messages.webauthn.WebAuthnCr\ - edentials.WebAuthnCredentialR\x0bcredentials\x1a\xea\x02\n\x12WebAuthnCr\ - edential\x12\x14\n\x05index\x18\x01\x20\x01(\rR\x05index\x12\x0e\n\x02id\ - \x18\x02\x20\x01(\x0cR\x02id\x12\x13\n\x05rp_id\x18\x03\x20\x01(\tR\x04r\ - pId\x12\x17\n\x07rp_name\x18\x04\x20\x01(\tR\x06rpName\x12\x17\n\x07user\ - _id\x18\x05\x20\x01(\x0cR\x06userId\x12\x1b\n\tuser_name\x18\x06\x20\x01\ - (\tR\x08userName\x12*\n\x11user_display_name\x18\x07\x20\x01(\tR\x0fuser\ - DisplayName\x12#\n\rcreation_time\x18\x08\x20\x01(\rR\x0ccreationTime\ - \x12\x1f\n\x0bhmac_secret\x18\t\x20\x01(\x08R\nhmacSecret\x12$\n\x0euse_\ - sign_count\x18\n\x20\x01(\x08R\x0cuseSignCount\x12\x1c\n\talgorithm\x18\ - \x0b\x20\x01(\x11R\talgorithm\x12\x14\n\x05curve\x18\x0c\x20\x01(\x11R\ - \x05curveB<\n#com.satoshilabs.trezor.lib.protobufB\x15TrezorMessageWebAu\ - thn\ + \n\x17messages-webauthn.proto\x12\x1bhw.trezor.messages.webauthn\"!\n\ + \x1fWebAuthnListResidentCredentials\"D\n\x1dWebAuthnAddResidentCredentia\ + l\x12#\n\rcredential_id\x18\x01\x20\x01(\x0cR\x0ccredentialId\"8\n\x20We\ + bAuthnRemoveResidentCredential\x12\x14\n\x05index\x18\x01\x20\x01(\rR\ + \x05index\"\xe9\x03\n\x13WebAuthnCredentials\x12e\n\x0bcredentials\x18\ + \x01\x20\x03(\x0b2C.hw.trezor.messages.webauthn.WebAuthnCredentials.WebA\ + uthnCredentialR\x0bcredentials\x1a\xea\x02\n\x12WebAuthnCredential\x12\ + \x14\n\x05index\x18\x01\x20\x01(\rR\x05index\x12\x0e\n\x02id\x18\x02\x20\ + \x01(\x0cR\x02id\x12\x13\n\x05rp_id\x18\x03\x20\x01(\tR\x04rpId\x12\x17\ + \n\x07rp_name\x18\x04\x20\x01(\tR\x06rpName\x12\x17\n\x07user_id\x18\x05\ + \x20\x01(\x0cR\x06userId\x12\x1b\n\tuser_name\x18\x06\x20\x01(\tR\x08use\ + rName\x12*\n\x11user_display_name\x18\x07\x20\x01(\tR\x0fuserDisplayName\ + \x12#\n\rcreation_time\x18\x08\x20\x01(\rR\x0ccreationTime\x12\x1f\n\x0b\ + hmac_secret\x18\t\x20\x01(\x08R\nhmacSecret\x12$\n\x0euse_sign_count\x18\ + \n\x20\x01(\x08R\x0cuseSignCount\x12\x1c\n\talgorithm\x18\x0b\x20\x01(\ + \x11R\talgorithm\x12\x14\n\x05curve\x18\x0c\x20\x01(\x11R\x05curveB<\n#c\ + om.satoshilabs.trezor.lib.protobufB\x15TrezorMessageWebAuthn\ "; /// `FileDescriptorProto` object which was a source for this generated file @@ -1238,8 +1237,7 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { static file_descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::FileDescriptor> = ::protobuf::rt::Lazy::new(); file_descriptor.get(|| { let generated_file_descriptor = generated_file_descriptor_lazy.get(|| { - let mut deps = ::std::vec::Vec::with_capacity(1); - deps.push(super::messages::file_descriptor().clone()); + let mut deps = ::std::vec::Vec::with_capacity(0); let mut messages = ::std::vec::Vec::with_capacity(5); messages.push(WebAuthnListResidentCredentials::generated_message_descriptor_data()); messages.push(WebAuthnAddResidentCredential::generated_message_descriptor_data());