From 5b2a8cdd2351106baf3ffa81afaad59df7e97372 Mon Sep 17 00:00:00 2001
From: Gyubong <jopemachine@naver.com>
Date: Mon, 23 Sep 2024 16:06:01 +0900
Subject: [PATCH] dep: Update raft-rs

---
 Cargo.lock         | 66 ++++++++++++++++++----------------------------
 raft-rs            |  2 +-
 raftify/Cargo.toml |  5 +++-
 3 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 23af7206..85f45054 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -351,15 +351,6 @@ 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"
@@ -1316,6 +1307,26 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "jopemachine-raft"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "035b4ce02b6a3a079884158fa604295dabfa426f0c0901f44ffeee8ded55b420"
+dependencies = [
+ "bytes",
+ "fxhash",
+ "getset",
+ "lazy_static",
+ "protobuf",
+ "raft-proto",
+ "rand",
+ "slog",
+ "slog-envlogger",
+ "slog-stdlog",
+ "slog-term",
+ "thiserror",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.70"
@@ -1819,28 +1830,17 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
 [[package]]
 name = "protobuf-build"
-version = "0.15.1"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c852d9625b912c3e50480cdc701f60f49890b5d7ad46198dd583600f15e7c6ec"
+checksum = "2df9942df2981178a930a72d442de47e2f0df18ad68e50a30f816f1848215ad0"
 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.37"
@@ -1850,27 +1850,11 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "raft"
-version = "0.7.0"
-dependencies = [
- "bytes",
- "fxhash",
- "getset",
- "lazy_static",
- "protobuf",
- "raft-proto",
- "rand",
- "slog",
- "slog-envlogger",
- "slog-stdlog",
- "slog-term",
- "thiserror",
-]
-
 [[package]]
 name = "raft-proto"
 version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb6884896294f553e8d5cfbdb55080b9f5f2f43394afff59c9f077e0f4b46d6b"
 dependencies = [
  "lazy_static",
  "prost",
@@ -1890,10 +1874,10 @@ dependencies = [
  "clap 4.5.18",
  "heed",
  "heed-traits",
+ "jopemachine-raft",
  "log",
  "parking_lot",
  "prost",
- "raft",
  "serde",
  "serde_json",
  "slog",
diff --git a/raft-rs b/raft-rs
index a18a5c90..48bb3f82 160000
--- a/raft-rs
+++ b/raft-rs
@@ -1 +1 @@
-Subproject commit a18a5c905d15cbb645e2ae197af34502dee68348
+Subproject commit 48bb3f82cbc52c46464bf3ff3702df7d41243946
diff --git a/raftify/Cargo.toml b/raftify/Cargo.toml
index df18fdae..a22388f5 100644
--- a/raftify/Cargo.toml
+++ b/raftify/Cargo.toml
@@ -18,7 +18,7 @@ heed-traits = "0.20"
 log = { version = "0.4", features = ["std"] }
 parking_lot = "0.12.3"
 prost = "0.11"
-raft = { path = "../raft-rs", features = ["prost-codec", "default-logger"], default-features = false }
+raft = { version = "0.7.9", features = ["prost-codec", "default-logger"], default-features = false, package = "jopemachine-raft" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 slog = "2"
@@ -36,3 +36,6 @@ tempfile = "3"
 [build-dependencies]
 tonic-build = "0.9.2"
 built = "0.5"
+
+[patch.crates-io]
+raft = { path = "../raft-rs" }
\ No newline at end of file