Skip to content

Commit

Permalink
[proto] Fix the proto build with newer prost plugins. (#10080)
Browse files Browse the repository at this point in the history
  • Loading branch information
larry-aptos authored Sep 17, 2023
1 parent 9d423c4 commit 44aa832
Show file tree
Hide file tree
Showing 7 changed files with 246 additions and 75 deletions.
137 changes: 98 additions & 39 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ members = [
"crates/aptos-openapi",
"crates/aptos-profiler",
"crates/aptos-proptest-helpers",
"crates/aptos-protos",
"crates/aptos-push-metrics",
"crates/aptos-rate-limiter",
"crates/aptos-rest-client",
Expand Down Expand Up @@ -230,8 +231,6 @@ members = [
"vm-validator",
]

exclude = ["crates/aptos-protos"]

# NOTE: default-members is the complete list of binaries that form the "production Aptos codebase". These members should
# never include crates that require fuzzing features or test features. These are the crates we want built with no extra
# test-only code included.
Expand Down Expand Up @@ -550,6 +549,7 @@ ouroboros = "0.15.6"
owo-colors = "3.5.0"
parking_lot = "0.12.0"
paste = "1.0.7"
pbjson = "0.5.1"
percent-encoding = "2.1.0"
pin-project = "1.0.10"
poem = { version = "=1.3.55", features = ["anyhow", "rustls"] }
Expand All @@ -565,8 +565,8 @@ prometheus-http-query = "0.5.2"
prometheus-parse = "0.2.4"
proptest = "1.0.0"
proptest-derive = "0.3.0"
prost = "0.11.3"
prost-types = "0.11.3"
prost = "0.12.1"
prost-types = "0.12.1"
quanta = "0.10.1"
quote = "1.0.18"
rand = "0.7.3"
Expand Down Expand Up @@ -630,14 +630,14 @@ tokio-stream = "0.1.8"
tokio-test = "0.4.1"
tokio-util = { version = "0.7.2", features = ["compat", "codec"] }
toml = "0.7.4"
tonic = { version = "0.8.3", features = [
tonic = { version = "0.10.0", features = [
"tls-roots",
"transport",
"prost",
"gzip",
"codegen",
] }
tonic-reflection = "0.6.0"
tonic-reflection = "0.10.0"
ureq = { version = "1.5.4", features = [
"json",
"native-tls",
Expand Down
Loading

0 comments on commit 44aa832

Please sign in to comment.