fix: adapt the Narwhal pointer in Sui post merge of narwhal/#859

This enacts the reversion of #818
MystenLabs · Aug 30, 2022 · 1543b92 · 1543b92
1 parent b7c1d4d
commit 1543b92
Show file tree

Hide file tree

Showing 18 changed files with 71 additions and 249 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml
@@ -41,7 +41,7 @@ sui-node = { path = "../sui-node" }
 sui-json-rpc-types = { path = "../sui-json-rpc-types" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "node" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "node" }
 workspace-hack = { path = "../workspace-hack"}
 test-utils = { path = "../test-utils" }
 

diff --git a/crates/sui-benchmark/src/benchmark/validator_preparer.rs b/crates/sui-benchmark/src/benchmark/validator_preparer.rs
@@ -284,7 +284,6 @@ fn make_authority_state(
     ));
     let epoch_store = Arc::new(EpochStore::new(path.join("epochs"), committee, Some(opts)));
     let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
-    let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
     (
         Runtime::new().unwrap().block_on(async {
             AuthorityState::new(
@@ -298,7 +297,6 @@ fn make_authority_state(
                 &sui_config::genesis::Genesis::get_default_genesis(),
                 &prometheus::Registry::new(),
                 tx_reconfigure_consensus,
-                tx_consensus_to_sui,
             )
             .await
         }),

diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
@@ -26,7 +26,7 @@ move-binary-format = { git = "https://github.com/move-language/move", rev = "70b
 move-package = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] }
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "config" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "config" }
 
 
 sui-framework = { path = "../sui-framework" }

diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml
@@ -50,11 +50,11 @@ typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090
 typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
 mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab" }
 
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "config" }
-narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "consensus" }
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "executor" }
-narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "types" }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "node" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "config" }
+narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "consensus" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "executor" }
+narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "types" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "node" }
 
 fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b"}
 workspace-hack = { path = "../workspace-hack"}