use NetworkKeyPair in ValidatorInfo (#4644)

MystenLabs · Sep 15, 2022 · d09e760 · d09e760
1 parent d242c08
commit d09e760
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/crates/sui-config/src/builder.rs b/crates/sui-config/src/builder.rs
@@ -131,12 +131,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
  .map(
  |(i, (key_pair, worker_key_pair, account_key_pair, network_key_pair)): (
  _,
- (
- AuthorityKeyPair,
- AuthorityKeyPair,
- SuiKeyPair,
- AuthorityKeyPair,
- ),
+ (AuthorityKeyPair, NetworkKeyPair, SuiKeyPair, NetworkKeyPair),
  )| {
  self.build_validator(
  i,

diff --git a/crates/sui-config/src/genesis.rs b/crates/sui-config/src/genesis.rs
@@ -20,7 +20,7 @@ use sui_adapter::in_memory_storage::InMemoryStorage;
 use sui_adapter::temporary_store::{InnerTemporaryStore, TemporaryStore};
 use sui_types::base_types::ObjectID;
 use sui_types::base_types::TransactionDigest;
-use sui_types::crypto::ToFromBytes;
+use sui_types::crypto::{AuthorityPublicKey, ToFromBytes};
 use sui_types::crypto::{AuthorityPublicKeyBytes, AuthoritySignature};
 use sui_types::gas::SuiGasStatus;
 use sui_types::messages::CallArg;
@@ -101,7 +101,7 @@ impl Genesis {
  .validator_set
  .iter()
  .map(|validator| {
- let name = NetworkPublicKey::from_bytes(validator.protocol_key().as_ref())
+ let name = AuthorityPublicKey::from_bytes(validator.protocol_key().as_ref())
  .expect("Can't get protocol key");
  let workers = [(
  0, // worker_id
@@ -624,7 +624,7 @@ mod test {
  let key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
  let worker_key: NetworkKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
  let account_key: AccountKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
- let network_key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
+ let network_key: NetworkKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
  let validator = ValidatorInfo {
  name: "0".into(),
  protocol_key: key.public().into(),