From 3211fb58a65efa7438c9c34795c3b929e6df8a77 Mon Sep 17 00:00:00 2001 From: Gyubong Date: Sat, 31 Aug 2024 11:59:19 +0900 Subject: [PATCH] refactor: Make `raft-rs` as git submodule --- Cargo.lock | 28 ++++++++++++++++++++++------ Cargo.toml | 1 + raftify/Cargo.toml | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5418b730..1e9e5070 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -350,6 +350,15 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +[[package]] +name = "autotools" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf" +dependencies = [ + "cc", +] + [[package]] name = "axum" version = "0.6.20" @@ -1296,8 +1305,6 @@ dependencies = [ [[package]] name = "jopemachine-raft" version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4326410d956002dc7adf04f299994c869a961d27d4fdec27a3310c4c209bd8fd" dependencies = [ "bytes", "fxhash", @@ -1802,17 +1809,28 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "protobuf-build" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df9942df2981178a930a72d442de47e2f0df18ad68e50a30f816f1848215ad0" +checksum = "c852d9625b912c3e50480cdc701f60f49890b5d7ad46198dd583600f15e7c6ec" dependencies = [ "bitflags 1.3.2", "proc-macro2", "prost-build", + "protobuf-src", "quote", + "regex", "syn 1.0.109", ] +[[package]] +name = "protobuf-src" +version = "1.1.0+21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" +dependencies = [ + "autotools", +] + [[package]] name = "quote" version = "1.0.36" @@ -1825,8 +1843,6 @@ dependencies = [ [[package]] name = "raft-proto" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6884896294f553e8d5cfbdb55080b9f5f2f43394afff59c9f077e0f4b46d6b" dependencies = [ "lazy_static", "prost", diff --git a/Cargo.toml b/Cargo.toml index 6b538bac..1a6c1aac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,7 @@ default-members = [ "examples/memstore/dynamic-members", "examples/memstore/static-members", ] +exclude = ["raft-rs"] [workspace.package] version = "0.1.67" diff --git a/raftify/Cargo.toml b/raftify/Cargo.toml index 667e452a..2dab44fb 100644 --- a/raftify/Cargo.toml +++ b/raftify/Cargo.toml @@ -18,7 +18,7 @@ heed-traits = "0.20.0-alpha.9" log = { version = "0.4", features = ["std"] } parking_lot = "0.12.1" prost = "0.11" -jopemachine-raft = { version = "0.7.7", features = ["prost-codec", "default-logger"], default-features = false } +jopemachine-raft = { path = "../raft-rs", features = ["prost-codec", "default-logger"], default-features = false } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" slog = "2"