[State Sync] Remove redundant data types and update dependencies.

Closes: #9057
diem · Jan 3, 2023 · 3deb47c · 3deb47c
1 parent ab757e9
commit 3deb47c
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -147,6 +147,7 @@ members = [
     "secure/storage",
     "secure/storage/github",
     "secure/storage/vault",
+    "state-sync/inter-component/consensus-notifications",
     "state-sync/inter-component/mempool-notifications",
     "state-sync/state-sync-v1",
     "state-sync/state-sync-v2",

diff --git a/mempool/src/lib.rs b/mempool/src/lib.rs
@@ -60,7 +60,7 @@ mod tests;
 pub use shared_mempool::{
     bootstrap, network,
     types::{
-        gen_mempool_reconfig_subscription, CommitResponse, ConsensusRequest, ConsensusResponse,
+        gen_mempool_reconfig_subscription, ConsensusRequest, ConsensusResponse,
         MempoolClientSender, SubmissionStatus, TransactionExclusion,
     },
 };

diff --git a/mempool/src/shared_mempool/types.rs b/mempool/src/shared_mempool/types.rs
@@ -166,31 +166,6 @@ pub enum ConsensusResponse {
     CommitResponse(),
 }
 
-#[derive(Debug)]
-pub struct CommitResponse {
-    pub success: bool,
-    /// The error message if `success` is false.
-    pub error_message: Option<String>,
-}
-
-impl CommitResponse {
-    // Returns a new CommitResponse without an error.
-    pub fn success() -> Self {
-        CommitResponse {
-            success: true,
-            error_message: None,
-        }
-    }
-
-    // Returns a new CommitResponse holding the given error message.
-    pub fn error(error_message: String) -> Self {
-        CommitResponse {
-            success: false,
-            error_message: Some(error_message),
-        }
-    }
-}
-
 #[derive(Clone)]
 pub struct TransactionExclusion {
     pub sender: AccountAddress,

diff --git a/state-sync/inter-component/consensus-notifications/Cargo.toml b/state-sync/inter-component/consensus-notifications/Cargo.toml
@@ -16,9 +16,9 @@ serde = { version = "1.0.124", default-features = false }
 thiserror = "1.0.24"
 tokio = { version = "1.8.1" }
 
-diem-crypto = { path = "../../../crypto/crypto" }
+diem-crypto = { path = "../../../crates/diem-crypto" }
 diem-types = { path = "../../../types" }
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
+diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" }
 
 [dev-dependencies]
 move-core-types = { path = "../../../language/move-core/types" }
diff --git a/state-sync/inter-component/mempool-notifications/Cargo.toml b/state-sync/inter-component/mempool-notifications/Cargo.toml
@@ -17,7 +17,7 @@ thiserror = "1.0.24"
 tokio = { version = "1.8.1" }
 
 diem-types = { path = "../../../types" }
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
+diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" }
 
 [dev-dependencies]
-diem-crypto = { path = "../../../crypto/crypto" }
+diem-crypto = { path = "../../../crates/diem-crypto" }
diff --git a/state-sync/state-sync-v1/Cargo.toml b/state-sync/state-sync-v1/Cargo.toml
@@ -52,7 +52,7 @@ bytes = "1.0.1"
 proptest = "1.0.0"
 
 consensus-notifications = { path = "../inter-component/consensus-notifications" }
-channel = { path = "../../common/channel" }
+channel = { path = "../../crates/channel" }
 diem-framework-releases= { path = "../../language/diem-framework/releases" }
 diem-crypto = { path = "../../crates/diem-crypto" }
 diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }