Skip to content

Commit

Permalink
Merge branch 'master' into optimize-window-cache-building-for-ibd
Browse files Browse the repository at this point in the history
  • Loading branch information
D-Stacks authored Oct 7, 2024
2 parents 38236de + b37f030 commit f439227
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
13 changes: 7 additions & 6 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ thiserror = "1.0.50"
tokio = { version = "1.33.0", features = ["sync", "rt-multi-thread"] }
tokio-stream = "0.1.14"
toml = "0.8.8"
tonic = { version = "0.12.2", features = ["tls-webpki-roots", "gzip", "transport"] }
tonic-build = { version = "0.12.2", features = ["prost"] }
tonic = { version = "0.12.3", features = ["tls-webpki-roots", "gzip", "transport"] }
tonic-build = { version = "0.12.3", features = ["prost"] }
triggered = "0.1.2"
uuid = { version = "1.5.0", features = ["v4", "fast-rng", "serde"] }
wasm-bindgen = { version = "0.2.93", features = ["serde-serialize"] }
Expand Down
2 changes: 1 addition & 1 deletion protocol/p2p/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ fn main() {
tonic_build::configure()
.build_server(true)
.build_client(true)
.compile(&proto_files[0..1], dirs)
.compile_protos(&proto_files[0..1], dirs)
.unwrap_or_else(|e| panic!("protobuf compilation failed, error: {e}"));
// recompile protobufs only if any of the proto files changes.
for file in proto_files {
Expand Down
2 changes: 1 addition & 1 deletion rpc/grpc/core/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn main() {
// uncomment this line and reflect the change in src/lib.rs
//.out_dir("./src")

.compile(&protowire_files[0..1], dirs)
.compile_protos(&protowire_files[0..1], dirs)
.unwrap_or_else(|e| panic!("protobuf compile error: {e}"));

// recompile protobufs only if any of the proto files changes.
Expand Down

0 comments on commit f439227

Please sign in to comment.