Skip to content

Commit

Permalink
chore(deps): upgrade tonic and prost
Browse files Browse the repository at this point in the history
  • Loading branch information
thevaibhav-dixit committed Oct 9, 2023
1 parent 5942d04 commit 2159027
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 45 deletions.
122 changes: 86 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres", "rus
sqlxmq = { git = "https://github.com/GaloyMoney/sqlxmq", rev = "f03f73c", default-features = false, features = ["runtime-tokio-rustls"] }
tokio = { version = "1.32", features = ["rt-multi-thread", "macros"] }
tokio-stream = { version = "0.1.14", features = ["sync"] }
tonic = "0.9"
tonic-health = "0.9"
tonic = "0.10.2"
tonic-health = "0.10.2"
rust_decimal = "1.32"
tracing = "0.1.37"
tracing-opentelemetry = "0.21.0"
tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json"] }
prost = "0.11"
prost-wkt-types = { version = "0.4.2", features = ["vendored-protoc"]}
prost = "0.12"
prost-wkt-types = { version = "0.5", features = ["vendored-protoc"]}
rust_decimal_macros = "1.32"
rusty-money = "0.4.1"
thiserror = "1.0.48"
Expand All @@ -54,4 +54,4 @@ regex = "1.9.3"

[build-dependencies]
protobuf-src = { version = "1.1.0" }
tonic-build = { version = "0.9", features = ["prost"] }
tonic-build = { version = "0.10.2", features = ["prost"] }
6 changes: 3 additions & 3 deletions src/api/server/convert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ impl From<Payout> for proto::Payout {
impl From<Wallet> for proto::Wallet {
fn from(wallet: Wallet) -> Self {
let id = wallet.id.to_string();
let name = wallet.name as String;
let name = wallet.name;
let config: proto::WalletConfig = proto::WalletConfig::from(wallet.config);
proto::Wallet {
id,
Expand Down Expand Up @@ -265,7 +265,7 @@ impl From<SigningSession> for proto::SigningSession {
impl From<proto::PayoutQueueConfig> for PayoutQueueConfig {
fn from(proto_config: proto::PayoutQueueConfig) -> Self {
let tx_priority =
proto::TxPriority::from_i32(proto_config.tx_priority).map(TxPriority::from);
proto::TxPriority::try_from(proto_config.tx_priority).map(TxPriority::from);
let consolidate_deprecated_keychains = proto_config.consolidate_deprecated_keychains;

let trigger = match proto_config.trigger {
Expand All @@ -288,7 +288,7 @@ impl From<proto::PayoutQueueConfig> for PayoutQueueConfig {
if let Some(trigger) = trigger {
ret.trigger = trigger;
}
if let Some(tx_priority) = tx_priority {
if let Ok(tx_priority) = tx_priority {
ret.tx_priority = tx_priority;
}
ret
Expand Down
2 changes: 1 addition & 1 deletion src/cli/api_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ impl ApiClient {
.into_iter()
.map(|bg| {
let tx_priority = TxPriority::from(
proto::TxPriority::from_i32(bg.config.as_ref().unwrap().tx_priority).unwrap(),
proto::TxPriority::try_from(bg.config.as_ref().unwrap().tx_priority).unwrap(),
);
let mut json = serde_json::to_value(bg).unwrap();
json.as_object_mut()
Expand Down

0 comments on commit 2159027

Please sign in to comment.