Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix narwhal dependency with net updates #1677

Merged
merged 16 commits into from
Apr 30, 2022
Merged

Fix narwhal dependency with net updates #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5b7d3e6
Configure consensus
asonnino Apr 28, 2022
299c7cc
Always execute shared-object certificartes
asonnino Apr 28, 2022
cc0f6ff
Rename consensus listener
asonnino Apr 28, 2022
4ee8de2
Fix tests
asonnino Apr 28, 2022
66c1d68
Fix tests
asonnino Apr 28, 2022
b77dddd
Update tests & narwhal dependency
asonnino Apr 28, 2022
8535202
fix clippy
asonnino Apr 28, 2022
ce9a796
Fix
asonnino Apr 28, 2022
297a4c5
Merge branch 'main' into fix-1624
asonnino Apr 28, 2022
7eec483
Fix clippy
asonnino Apr 28, 2022
fac67a9
fix bug
asonnino Apr 29, 2022
b967a92
Cleanup
asonnino Apr 29, 2022
17064dd
Uncomment test
asonnino Apr 29, 2022
ebdd7cc
Update narwhal
asonnino Apr 29, 2022
f45f648
Merge branch 'main' into so-fix
asonnino Apr 29, 2022
448f3a5
Add sync test
asonnino Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 47 additions & 52 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions sui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ move-binary-format = { git = "https://github.com/move-language/move", rev = "4e0
move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "4e025186af502c931318884df53c11bf34a664bc" }
move-unit-test = { git = "https://github.com/move-language/move", rev = "4e025186af502c931318884df53c11bf34a664bc" }

narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "976355d2ff75aefc6b7ec7fd32742d3d7188c4e0", package = "node" }
narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "976355d2ff75aefc6b7ec7fd32742d3d7188c4e0", package = "config" }
narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "976355d2ff75aefc6b7ec7fd32742d3d7188c4e0", package = "crypto" }
narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "72efe71f0615f91f861cc658e031b763ba30fd5b", package = "node" }
narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "72efe71f0615f91f861cc658e031b763ba30fd5b", package = "config" }
narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "72efe71f0615f91f861cc658e031b763ba30fd5b", package = "crypto" }

once_cell = "1.10.0"

Expand Down
6 changes: 1 addition & 5 deletions sui/src/sui_commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,11 +553,7 @@ pub async fn make_authority(

// Spawn a consensus listener. It listen for consensus outputs and notifies the
// authority server when a sequenced transaction is ready for execution.
ConsensusListener::spawn(
authority_state.clone(),
rx_sui_to_consensus,
rx_consensus_to_sui,
);
ConsensusListener::spawn(rx_sui_to_consensus, rx_consensus_to_sui);

// If we have network information make authority clients
// to all authorities in the system.
Expand Down
Loading