Skip to content

Commit

Permalink
narwhal: update narwhal pointer to a188b870eb1a4b601a58e5744290b7d56c…
Browse files Browse the repository at this point in the history
…cd4039

This updates the narwhal dependencies to commit
a188b870eb1a4b601a58e5744290b7d56ccd4039 which includes the following
changes:

- Conversion to gRPC network interfaces
- Conversion to using the multiaddr format for describing network
  endpoints.

Fixes: MystenLabs#1452
  • Loading branch information
bmwill committed May 11, 2022
1 parent 119832d commit f0d3ad7
Show file tree
Hide file tree
Showing 15 changed files with 183 additions and 191 deletions.
92 changes: 60 additions & 32 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ move-binary-format = { git = "https://github.com/move-language/move", rev = "3d8
move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "3d80936565ef39550f99b37c7c1accde74069fc5" }
move-unit-test = { git = "https://github.com/move-language/move", rev = "3d80936565ef39550f99b37c7c1accde74069fc5" }

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" }
narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "node" }
narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "config" }
narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "crypto" }

once_cell = "1.10.0"

Expand Down
26 changes: 4 additions & 22 deletions sui/src/bin/bench_configure.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
// Copyright (c) 2022, Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0

#![deny(warnings)]

use clap::*;
use std::collections::BTreeMap;
use std::{
net::{IpAddr, Ipv4Addr, SocketAddr},
path::Path,
};
use std::path::Path;
use sui::{
benchmark::bench_types::RemoteLoadGenConfig,
config::{
Expand Down Expand Up @@ -49,27 +44,14 @@ fn main() {
let db_path = format!("DB_{}", validator_address);
let path = Path::new(&db_path);

let host_bytes: Vec<u8> = host
.split('.')
.into_iter()
.map(|q| q.parse::<u8>().unwrap())
.collect();
let consensus_address = SocketAddr::new(
IpAddr::V4(Ipv4Addr::new(
host_bytes[0],
host_bytes[1],
host_bytes[2],
host_bytes[3],
)),
port + 1,
);

let auth = AuthorityInfo {
address: validator_address,
network_address: format!("/dns/{host}/tcp/{port}/http").parse().unwrap(),
db_path: path.to_path_buf(),
stake,
consensus_address,
consensus_address: format!("/dns/{host}/tcp/{}/http", port + 1)
.parse()
.unwrap(),
public_key: *validator_keypair.public_key_bytes(),
};

Expand Down
Loading

0 comments on commit f0d3ad7

Please sign in to comment.