[genesis] Remove name and operator name

serhiiMakar · May 5, 2022 · 198ca9e · 198ca9e
1 parent 39852b1
commit 198ca9e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/aptos-move/vm-genesis/src/lib.rs b/aptos-move/vm-genesis/src/lib.rs
@@ -352,17 +352,13 @@ pub fn test_genesis_change_set_and_validators(
 pub struct Validator {
     /// The Aptos account address of the validator
     pub address: AccountAddress,
-    /// UTF8-encoded name for the validator
-    pub name: Vec<u8>,
     /// Authentication key for the validator
     pub auth_key: AuthenticationKey,
     /// Ed25519 public key used to sign consensus messages
     pub consensus_pubkey: Vec<u8>,
     /// The Aptos account address of the validator's operator (same as `address` if the validator is
     /// its own operator)
     pub operator_address: AccountAddress,
-    /// UTF8-encoded name of the operator
-    pub operator_name: Vec<u8>,
     /// Authentication key for the operator
     pub operator_auth_key: AuthenticationKey,
     /// `NetworkAddress` for the validator
@@ -392,17 +388,14 @@ impl TestValidator {
         let consensus_pubkey = key.public_key().to_bytes().to_vec();
         let operator_auth_key = auth_key;
         let operator_address = operator_auth_key.derived_address();
-        let operator_name = name.clone();
         let network_address = [0u8; 0].to_vec();
         let full_node_network_address = [0u8; 0].to_vec();
 
         let data = Validator {
             address,
-            name,
             auth_key,
             consensus_pubkey,
             operator_address,
-            operator_name,
             operator_auth_key,
             network_address,
             full_node_network_address,

diff --git a/config/management/genesis/src/builder.rs b/config/management/genesis/src/builder.rs
@@ -121,7 +121,6 @@ impl<S: KVStorage> GenesisBuilder<S> {
                     AuthenticationKey::ed25519(&k)
                 });
             let operator = self.operator(owner)?;
-            let operator_name = operator.as_bytes().to_vec();
             let operator_auth_key = AuthenticationKey::ed25519(&self.operator_key(&operator)?);
             let operator_address = operator_auth_key.derived_address();
             let validator_config = self.validator_config(&operator)?;
@@ -130,11 +129,9 @@ impl<S: KVStorage> GenesisBuilder<S> {
             let full_node_network_address = bcs::from_bytes(&validator_config.args()[3])?;
             validators.push(Validator {
                 address,
-                name,
                 auth_key,
                 consensus_pubkey,
                 operator_address,
-                operator_name,
                 operator_auth_key,
                 network_address,
                 full_node_network_address,

diff --git a/crates/aptos/src/genesis/config.rs b/crates/aptos/src/genesis/config.rs
@@ -83,10 +83,8 @@ impl From<ValidatorConfiguration> for Validator {
 
         Validator {
             address: auth_key.derived_address(),
-            name: vec![], // TODO: To remove
             consensus_pubkey: bcs::to_bytes(&config.consensus_key).unwrap(),
             operator_address: auth_key.derived_address(),
-            operator_name: vec![], // TODO: To remove
             network_address: bcs::to_bytes(&validator_addresses).unwrap(),
             full_node_network_address: bcs::to_bytes(&full_node_addresses).unwrap(),
             operator_auth_key: auth_key,