Skip to content

Commit 970dd3f

Browse files
benmabenma
committed
Merge branch 'prost'
2 parents 383bca0 + 06112e7 commit 970dd3f

File tree

4 files changed

+29
-25
lines changed

4 files changed

+29
-25
lines changed

‎Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ hex = { version = "0.4" }
2424
noise-protocol = "0.2"
2525
noise-rust-crypto = "0.6"
2626
num-bigint = "0.4"
27-
prost = "0.12"
27+
# If you change this, also change the version of prost-build in scripts/build-protos.rs
28+
# and run `make build-protos`.
29+
prost = "0.13"
2830
semver = "1.0.17"
2931
serde_json = { version = "1.0" }
3032
thiserror = "1.0"

‎scripts/build-protos.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! ```cargo
22
//! [dependencies]
3-
//! prost-build = { version = "0.11" }
3+
//! # If you change this, also change the version of prost in Cargo.toml.
4+
//! prost-build = { version = "0.13" }
45
//! ```
56
67
use std::io::Result;

‎src/shiftcrypto.bitbox02.rs

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// This file is @generated by prost-build.
12
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
23
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
34
#[allow(clippy::derive_partial_eq_without_eq)]
@@ -9,7 +10,7 @@ pub struct PubResponse {
910
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
1011
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
1112
#[allow(clippy::derive_partial_eq_without_eq)]
12-
#[derive(Clone, PartialEq, ::prost::Message)]
13+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
1314
pub struct RootFingerprintRequest {}
1415
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
1516
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
@@ -71,7 +72,7 @@ pub struct KeyOriginInfo {
7172
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
7273
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
7374
#[allow(clippy::derive_partial_eq_without_eq)]
74-
#[derive(Clone, PartialEq, ::prost::Message)]
75+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
7576
pub struct CheckBackupRequest {
7677
#[prost(bool, tag = "1")]
7778
pub silent: bool,
@@ -88,7 +89,7 @@ pub struct CheckBackupResponse {
8889
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
8990
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
9091
#[allow(clippy::derive_partial_eq_without_eq)]
91-
#[derive(Clone, PartialEq, ::prost::Message)]
92+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
9293
pub struct CreateBackupRequest {
9394
#[prost(uint32, tag = "1")]
9495
pub timestamp: u32,
@@ -98,7 +99,7 @@ pub struct CreateBackupRequest {
9899
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
99100
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
100101
#[allow(clippy::derive_partial_eq_without_eq)]
101-
#[derive(Clone, PartialEq, ::prost::Message)]
102+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
102103
pub struct ListBackupsRequest {}
103104
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
104105
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
@@ -136,20 +137,20 @@ pub struct RestoreBackupRequest {
136137
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
137138
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
138139
#[allow(clippy::derive_partial_eq_without_eq)]
139-
#[derive(Clone, PartialEq, ::prost::Message)]
140+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
140141
pub struct CheckSdCardRequest {}
141142
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
142143
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
143144
#[allow(clippy::derive_partial_eq_without_eq)]
144-
#[derive(Clone, PartialEq, ::prost::Message)]
145+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
145146
pub struct CheckSdCardResponse {
146147
#[prost(bool, tag = "1")]
147148
pub inserted: bool,
148149
}
149150
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
150151
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
151152
#[allow(clippy::derive_partial_eq_without_eq)]
152-
#[derive(Clone, PartialEq, ::prost::Message)]
153+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
153154
pub struct DeviceInfoRequest {}
154155
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
155156
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
@@ -173,7 +174,7 @@ pub struct DeviceInfoResponse {
173174
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
174175
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
175176
#[allow(clippy::derive_partial_eq_without_eq)]
176-
#[derive(Clone, PartialEq, ::prost::Message)]
177+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
177178
pub struct InsertRemoveSdCardRequest {
178179
#[prost(enumeration = "insert_remove_sd_card_request::SdCardAction", tag = "1")]
179180
pub action: i32,
@@ -222,7 +223,7 @@ pub mod insert_remove_sd_card_request {
222223
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
223224
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
224225
#[allow(clippy::derive_partial_eq_without_eq)]
225-
#[derive(Clone, PartialEq, ::prost::Message)]
226+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
226227
pub struct ResetRequest {}
227228
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
228229
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
@@ -753,7 +754,7 @@ pub struct BtcScriptConfigRegistration {
753754
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
754755
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
755756
#[allow(clippy::derive_partial_eq_without_eq)]
756-
#[derive(Clone, PartialEq, ::prost::Message)]
757+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
757758
pub struct BtcSuccess {}
758759
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
759760
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
@@ -766,7 +767,7 @@ pub struct BtcIsScriptConfigRegisteredRequest {
766767
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
767768
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
768769
#[allow(clippy::derive_partial_eq_without_eq)]
769-
#[derive(Clone, PartialEq, ::prost::Message)]
770+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
770771
pub struct BtcIsScriptConfigRegisteredResponse {
771772
#[prost(bool, tag = "1")]
772773
pub is_registered: bool,
@@ -830,7 +831,7 @@ pub mod btc_register_script_config_request {
830831
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
831832
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
832833
#[allow(clippy::derive_partial_eq_without_eq)]
833-
#[derive(Clone, PartialEq, ::prost::Message)]
834+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
834835
pub struct BtcPrevTxInitRequest {
835836
#[prost(uint32, tag = "1")]
836837
pub version: u32,
@@ -1810,12 +1811,12 @@ pub struct ElectrumEncryptionKeyResponse {
18101811
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
18111812
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
18121813
#[allow(clippy::derive_partial_eq_without_eq)]
1813-
#[derive(Clone, PartialEq, ::prost::Message)]
1814+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
18141815
pub struct ShowMnemonicRequest {}
18151816
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
18161817
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
18171818
#[allow(clippy::derive_partial_eq_without_eq)]
1818-
#[derive(Clone, PartialEq, ::prost::Message)]
1819+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
18191820
pub struct RestoreFromMnemonicRequest {
18201821
#[prost(uint32, tag = "1")]
18211822
pub timestamp: u32,
@@ -1825,15 +1826,15 @@ pub struct RestoreFromMnemonicRequest {
18251826
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
18261827
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
18271828
#[allow(clippy::derive_partial_eq_without_eq)]
1828-
#[derive(Clone, PartialEq, ::prost::Message)]
1829+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
18291830
pub struct SetMnemonicPassphraseEnabledRequest {
18301831
#[prost(bool, tag = "1")]
18311832
pub enabled: bool,
18321833
}
18331834
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
18341835
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
18351836
#[allow(clippy::derive_partial_eq_without_eq)]
1836-
#[derive(Clone, PartialEq, ::prost::Message)]
1837+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
18371838
pub struct RebootRequest {
18381839
#[prost(enumeration = "reboot_request::Purpose", tag = "1")]
18391840
pub purpose: i32,
@@ -1919,7 +1920,7 @@ pub struct Error {
19191920
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
19201921
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]
19211922
#[allow(clippy::derive_partial_eq_without_eq)]
1922-
#[derive(Clone, PartialEq, ::prost::Message)]
1923+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
19231924
pub struct Success {}
19241925
#[cfg_attr(feature = "wasm", derive(serde::Serialize, serde::Deserialize))]
19251926
#[cfg_attr(feature = "wasm", serde(rename_all = "camelCase"))]

0 commit comments

Comments
 (0)