diff --git a/Cargo.lock b/Cargo.lock index e5ced780120..ed25208ff48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -244,35 +244,6 @@ dependencies = [ "cc", ] -[[package]] -name = "axum" -version = "0.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" -dependencies = [ - "async-trait", - "axum-core 0.2.9", - "bitflags 1.3.2", - "bytes 1.5.0", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit 0.5.0", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde", - "sync_wrapper", - "tokio", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.6.20" @@ -280,7 +251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core 0.3.4", + "axum-core", "bitflags 1.3.2", "bytes 1.5.0", "futures-util", @@ -288,7 +259,7 @@ dependencies = [ "http-body", "hyper", "itoa", - "matchit 0.7.3", + "matchit", "memchr", "mime", "percent-encoding", @@ -301,22 +272,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "axum-core" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" -dependencies = [ - "async-trait", - "bytes 1.5.0", - "futures-util", - "http", - "http-body", - "mime", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.3.4" @@ -923,15 +878,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -982,8 +928,8 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ - "prost 0.11.9", - "prost-types 0.11.9", + "prost", + "prost-types", "tonic 0.9.2", "tracing-core", ] @@ -1000,7 +946,7 @@ dependencies = [ "futures 0.3.29", "hdrhistogram", "humantime 2.1.0", - "prost-types 0.11.9", + "prost-types", "serde", "serde_json", "thread_local", @@ -2417,12 +2363,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "httparse" version = "1.8.0" @@ -3000,12 +2940,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" -[[package]] -name = "matchit" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" - [[package]] name = "matchit" version = "0.7.3" @@ -3119,8 +3053,8 @@ dependencies = [ "borsh", "chrono", "log", - "prost 0.10.0", - "prost-types 0.10.1", + "prost", + "prost-types", "rand", "rcgen", "subtle", @@ -3132,7 +3066,7 @@ dependencies = [ "tari_utilities", "thiserror", "tokio", - "tonic 0.7.2", + "tonic 0.8.3", "tonic-build", "zeroize", ] @@ -3156,7 +3090,7 @@ dependencies = [ "tari_utilities", "thiserror", "tokio", - "tonic 0.7.2", + "tonic 0.8.3", ] [[package]] @@ -3228,7 +3162,7 @@ dependencies = [ "tari_utilities", "thiserror", "tokio", - "tonic 0.7.2", + "tonic 0.8.3", "tui", "unicode-segmentation", "unicode-width", @@ -3271,7 +3205,7 @@ dependencies = [ "tari_utilities", "thiserror", "tokio", - "tonic 0.7.2", + "tonic 0.8.3", "tracing", "url", ] @@ -3297,7 +3231,7 @@ dependencies = [ "minotari_app_utilities", "native-tls", "num_cpus", - "prost-types 0.9.0", + "prost-types", "rand", "serde", "serde_json", @@ -3309,7 +3243,7 @@ dependencies = [ "tari_utilities", "thiserror", "tokio", - "tonic 0.7.2", + "tonic 0.8.3", ] [[package]] @@ -3372,7 +3306,7 @@ dependencies = [ "thiserror", "tokio", "toml 0.5.11", - "tonic 0.7.2", + "tonic 0.8.3", ] [[package]] @@ -3404,7 +3338,7 @@ dependencies = [ "itertools 0.10.5", "libsqlite3-sys", "log", - "prost 0.10.0", + "prost", "rand", "serde", "serde_json", @@ -3480,7 +3414,7 @@ dependencies = [ "tari_common_types", "thiserror", "tokio", - "tonic 0.7.2", + "tonic 0.8.3", ] [[package]] @@ -4424,26 +4358,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes 1.5.0", - "prost-derive 0.9.0", -] - -[[package]] -name = "prost" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd5316aa8f5c82add416dfbc25116b84b748a21153f512917e8143640a71bbd" -dependencies = [ - "bytes 1.5.0", - "prost-derive 0.10.1", -] - [[package]] name = "prost" version = "0.11.9" @@ -4451,77 +4365,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes 1.5.0", - "prost-derive 0.11.9", -] - -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes 1.5.0", - "heck 0.3.3", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph 0.6.4", - "prost 0.9.0", - "prost-types 0.9.0", - "regex", - "tempfile", - "which", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.10.4" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes 1.5.0", - "cfg-if", - "cmake", "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", "multimap", "petgraph 0.6.4", - "prost 0.10.0", - "prost-types 0.10.1", + "prettyplease", + "prost", + "prost-types", "regex", + "syn 1.0.109", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "prost-derive" version = "0.11.9" @@ -4535,33 +4403,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes 1.5.0", - "prost 0.9.0", -] - -[[package]] -name = "prost-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" -dependencies = [ - "bytes 1.5.0", - "prost 0.10.0", -] - [[package]] name = "prost-types" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost 0.11.9", + "prost", ] [[package]] @@ -5789,7 +5637,7 @@ dependencies = [ "log4rs", "multiaddr", "path-clean", - "prost-build 0.9.0", + "prost-build", "serde", "serde_json", "serde_yaml 0.9.27", @@ -5861,7 +5709,7 @@ dependencies = [ "nom", "once_cell", "pin-project 1.1.3", - "prost 0.10.0", + "prost", "rand", "serde", "serde_derive", @@ -5911,7 +5759,7 @@ dependencies = [ "once_cell", "petgraph 0.5.1", "pin-project 0.4.30", - "prost 0.10.0", + "prost", "rand", "serde", "tari_common", @@ -5937,7 +5785,7 @@ version = "1.0.0-pre.4" dependencies = [ "futures 0.3.29", "proc-macro2", - "prost 0.10.0", + "prost", "quote", "syn 1.0.109", "tari_comms", @@ -5957,7 +5805,7 @@ dependencies = [ "log", "num-derive 0.3.3", "num-traits", - "prost 0.10.0", + "prost", "rand", "serde", "serde_json", @@ -6012,7 +5860,7 @@ dependencies = [ "num-traits", "once_cell", "primitive-types", - "prost 0.10.0", + "prost", "quickcheck", "rand", "randomx-rs", @@ -6121,7 +5969,7 @@ dependencies = [ "thiserror", "time", "tokio", - "tonic 0.7.2", + "tonic 0.8.3", ] [[package]] @@ -6221,7 +6069,7 @@ dependencies = [ "lmdb-zero", "log", "pgp", - "prost 0.10.0", + "prost", "rand", "reqwest", "rustls", @@ -6654,13 +6502,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.7.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", - "axum 0.5.17", + "axum", "base64 0.13.1", "bytes 1.5.0", "futures-core", @@ -6672,8 +6520,8 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project 1.1.3", - "prost 0.10.0", - "prost-derive 0.10.1", + "prost", + "prost-derive", "rustls-native-certs", "rustls-pemfile 1.0.3", "tokio", @@ -6694,7 +6542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", - "axum 0.6.20", + "axum", "base64 0.21.5", "bytes 1.5.0", "futures-core", @@ -6706,7 +6554,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project 1.1.3", - "prost 0.11.9", + "prost", "tokio", "tokio-stream", "tower", @@ -6717,13 +6565,13 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.7.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9263bf4c9bfaae7317c1c2faf7f18491d2fe476f70c414b73bf5d445b00ffa1" +checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" dependencies = [ "prettyplease", "proc-macro2", - "prost-build 0.10.4", + "prost-build", "quote", "syn 1.0.109", ] @@ -6762,25 +6610,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags 1.3.2", - "bytes 1.5.0", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.2" diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml index 806a41ae971..41a317584d5 100644 --- a/applications/minotari_app_grpc/Cargo.toml +++ b/applications/minotari_app_grpc/Cargo.toml @@ -20,18 +20,18 @@ base64 = "0.13.0" borsh = "1.2" chrono = { version = "0.4.19", default-features = false } log = "0.4" -prost = "0.10" -prost-types = "0.10" +prost = "0.11.9" +prost-types = "0.11.9" rand = "0.8" rcgen = "0.11.3" subtle = { version = "2.5.0", features = ["core_hint_black_box"] } thiserror = "1" tokio = { version = "1.23", features = ["fs"] } -tonic = { version = "0.7.2", features = ["tls"]} +tonic = { version = "0.8.3", features = ["tls"]} zeroize = "1" [build-dependencies] -tonic-build = "0.7.2" +tonic-build = "0.8.4" [package.metadata.cargo-machete] ignored = ["prost"] # this is so we can run cargo machete without getting false positive about macro dependancies diff --git a/applications/minotari_app_utilities/Cargo.toml b/applications/minotari_app_utilities/Cargo.toml index accad136881..4758ff3c725 100644 --- a/applications/minotari_app_utilities/Cargo.toml +++ b/applications/minotari_app_utilities/Cargo.toml @@ -22,7 +22,7 @@ tokio = { version = "1.23", features = ["signal"] } serde = "1.0.126" thiserror = "^1.0.26" dialoguer = { version = "0.10" } -tonic = "0.7.2" +tonic = "0.8.3" [build-dependencies] diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml index 73623f8fa3c..07dee067386 100644 --- a/applications/minotari_console_wallet/Cargo.toml +++ b/applications/minotari_console_wallet/Cargo.toml @@ -48,7 +48,7 @@ sha2 = "0.10" strum = "0.22" strum_macros = "0.22" thiserror = "1.0.26" -tonic = "0.7.2" +tonic = "0.8.3" unicode-segmentation = "1.6.0" unicode-width = "0.1" zeroize = "1" diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml index 73db17da9bc..3a77842e22b 100644 --- a/applications/minotari_merge_mining_proxy/Cargo.toml +++ b/applications/minotari_merge_mining_proxy/Cargo.toml @@ -41,7 +41,7 @@ serde = { version = "1.0.106", features = ["derive"] } serde_json = "1.0.57" thiserror = "1.0.26" tokio = { version = "1.23", features = ["macros"] } -tonic = "0.7.2" +tonic = "0.8.3" tracing = "0.1" url = "2.1.1" diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml index 8e314521cc4..6eb4d96ee00 100644 --- a/applications/minotari_miner/Cargo.toml +++ b/applications/minotari_miner/Cargo.toml @@ -36,10 +36,10 @@ serde = { version = "1.0", default_features = false, features = ["derive"] } serde_json = "1.0.57" thiserror = "1.0" tokio = { version = "1.23", default_features = false, features = ["rt-multi-thread"] } -tonic = { version = "0.7.2", features = ["tls", "tls-roots" ] } +tonic = { version = "0.8.3", features = ["tls", "tls-roots" ] } [dev-dependencies] -prost-types = "0.9" +prost-types = "0.11.9" chrono = { version = "0.4.19", default-features = false } config = "0.13.0" diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml index 04c4408bd99..6dac212aa61 100644 --- a/applications/minotari_node/Cargo.toml +++ b/applications/minotari_node/Cargo.toml @@ -46,7 +46,7 @@ serde = "1.0.136" strum = { version = "0.22", features = ["derive"] } thiserror = "^1.0.26" tokio = { version = "1.23", features = ["signal"] } -tonic = { version = "0.7.2", features = ["tls", "tls-roots" ] } +tonic = { version = "0.8.3", features = ["tls", "tls-roots" ] } # Metrics tari_metrics = { path = "../../infrastructure/metrics", optional = true, features = ["server"] } diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml index 4a52f8f822d..051507c5751 100644 --- a/base_layer/contacts/Cargo.toml +++ b/base_layer/contacts/Cargo.toml @@ -25,7 +25,7 @@ futures = { version = "^0.3.1", features = ["compat", "std"] } log = "0.4.6" num-derive = "0.3.3" num-traits = "0.2.15" -prost = "0.10" +prost = "0.11.9" rand = "0.8" serde = "1.0.136" serde_json = "1.0.79" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 3187c634187..2863e34ece5 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -61,7 +61,7 @@ num-traits = "0.2.15" num-derive = "0.3.3" num-format = "0.4.0" once_cell = "1.8.0" -prost = "0.10" +prost = "0.11.9" rand = "0.8" randomx-rs = { version = "1.3", optional = true } serde = { version = "1.0.106", features = ["derive"] } diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 52f046d7a2f..9dcbdb3d5c2 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -25,7 +25,7 @@ futures = { version = "^0.3.1" } lmdb-zero = "0.4.4" log = "0.4.6" pgp = { version = "0.10", optional = true } -prost = "=0.10.0" +prost = "0.11.9" rand = "0.8" reqwest = { version = "0.11", optional = true, default-features = false } rustls = "0.20.2" diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index 964049bbb77..43247743d56 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -51,7 +51,7 @@ strum_macros = "0.22" tempfile = "3.1.0" thiserror = "1.0.26" tower = "0.4" -prost = "0.10" +prost = "0.11.9" itertools = "0.10.3" chacha20poly1305 = "0.10.1" zeroize = "1" @@ -65,7 +65,7 @@ tari_comms_dht = { path = "../../comms/dht", features = ["test-mocks"] } tari_test_utils = { path = "../../infrastructure/test_utils" } tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto", "base_node"] } env_logger = "0.7.1" -prost = "0.10.0" +prost = "0.11.9" [features] default = ["bundled_sqlite"] diff --git a/clients/rust/wallet_grpc_client/Cargo.toml b/clients/rust/wallet_grpc_client/Cargo.toml index d7d4e0db8d5..0a17c9a9fc8 100644 --- a/clients/rust/wallet_grpc_client/Cargo.toml +++ b/clients/rust/wallet_grpc_client/Cargo.toml @@ -14,7 +14,7 @@ minotari_app_grpc = { path = "../../../applications/minotari_app_grpc" } tari_common_types = { path = "../../../base_layer/common_types" } thiserror = "1.0.35" -tonic = { version = "0.7.2", default-features = false, features = ["codegen", "transport", "tls"] } +tonic = { version = "0.8.3", default-features = false, features = ["codegen", "transport", "tls"] } [dev-dependencies] tokio = { version = "1", features = ["macros"] } diff --git a/common/Cargo.toml b/common/Cargo.toml index 55d04d58df2..6422193ddc7 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -25,7 +25,7 @@ log = "0.4.8" log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format"] } multiaddr = { version = "0.14.0" } path-clean = "0.1.0" -prost-build = { version = "0.9.0", optional = true } +prost-build = { version = "0.11.9", optional = true } serde = { version = "1.0.106", default_features = false } serde_json = "1.0.51" serde_yaml = "0.9.17" diff --git a/comms/core/Cargo.toml b/comms/core/Cargo.toml index f28dadad494..1e7c69cc2d6 100644 --- a/comms/core/Cargo.toml +++ b/comms/core/Cargo.toml @@ -34,7 +34,7 @@ multiaddr = { version = "0.14.0" } nom = { version = "7.1", features = ["std"], default-features = false } once_cell = "1.8.0" pin-project = "1.0.8" -prost = "=0.10.0" +prost = "=0.11.9" rand = "0.8" serde = "1.0.119" serde_derive = "1.0.119" diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index fe363f75f3a..fb8a6f11880 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -31,7 +31,7 @@ digest = "0.10" futures = "^0.3.1" log = "0.4.8" log-mdc = "0.1.0" -prost = "=0.10.0" +prost = "=0.11.9" rand = "0.8" serde = "1.0.90" thiserror = "1.0.26" diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index 535ade44f31..68adb6e678a 100644 --- a/comms/rpc_macros/Cargo.toml +++ b/comms/rpc_macros/Cargo.toml @@ -23,6 +23,6 @@ tari_comms = { path = "../core", features = ["rpc"] } tari_test_utils = { path = "../../infrastructure/test_utils" } futures = "0.3.5" -prost = "0.10.0" +prost = "0.11.9" tokio = { version = "1", features = ["macros"] } tower-service = "0.3" diff --git a/comms/rpc_macros/tests/macro.rs b/comms/rpc_macros/tests/macro.rs index 0c363559428..fa39623f59e 100644 --- a/comms/rpc_macros/tests/macro.rs +++ b/comms/rpc_macros/tests/macro.rs @@ -56,8 +56,8 @@ pub trait Test: Sync + Send + 'static { fn some_non_rpc_method(&self); } -#[derive(prost::Message)] -pub struct CustomMessage; +#[derive(Clone, PartialEq, prost::Message)] +pub struct CustomMessage {} #[derive(Default)] pub struct TestService { @@ -127,7 +127,7 @@ async fn it_correctly_maps_the_method_nums() { .unwrap(); assert_eq!(*spy.read().await.get("request_response").unwrap(), 1); server - .call(Request::new(2.into(), CustomMessage.to_encoded_bytes().into())) + .call(Request::new(2.into(), CustomMessage {}.to_encoded_bytes().into())) .await .unwrap(); assert_eq!(*spy.read().await.get("server_streaming").unwrap(), 1); @@ -167,7 +167,7 @@ async fn it_generates_client_calls() { // This is a test that the correct client functions are generated - if this test compiles then it has already passed task::spawn(async move { let _result = client.request_response(111).await; - let mut streaming_resp = client.server_streaming(CustomMessage).await.unwrap(); + let mut streaming_resp = client.server_streaming(CustomMessage {}).await.unwrap(); streaming_resp.next().await; let _result = client.unit().await; }); diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 4ed37507313..c9ce21a052b 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -49,7 +49,7 @@ tempfile = "3.3.0" thiserror = "^1.0.20" time = "0.3.15" tokio = { version = "1.10", features = ["macros", "time", "sync", "rt-multi-thread"] } -tonic = "0.7.0" +tonic = "0.8.3" [package.metadata.cargo-machete] ignored = ["minotari_wallet_ffi", "minotari_chat_ffi"]