More renames

Author: piotrm50

crates/iota-config/src/node.rs

@@ -52,9 +52,9 @@ pub const DEFAULT_COMMISSION_RATE: u64 = 200;
 #[serde(rename_all = "kebab-case")]
 pub struct NodeConfig {
     #[serde(default = "default_authority_key_pair")]
-    pub protocol_key_pair: AuthorityKeyPairWithPath,
+    pub authority_key_pair: AuthorityKeyPairWithPath,
     #[serde(default = "default_key_pair")]
-    pub worker_key_pair: KeyPairWithPath,
+    pub protocol_key_pair: KeyPairWithPath,
     #[serde(default = "default_key_pair")]
     pub account_key_pair: KeyPairWithPath,
     #[serde(default = "default_key_pair")]
@@ -368,12 +368,12 @@ fn is_true(value: &bool) -> bool {
 impl Config for NodeConfig {}
 
 impl NodeConfig {
-    pub fn protocol_key_pair(&self) -> &AuthorityKeyPair {
-        self.protocol_key_pair.authority_keypair()
+    pub fn authority_key_pair(&self) -> &AuthorityKeyPair {
+        self.authority_key_pair.authority_keypair()
     }
 
-    pub fn worker_key_pair(&self) -> &NetworkKeyPair {
-        match self.worker_key_pair.keypair() {
+    pub fn protocol_key_pair(&self) -> &NetworkKeyPair {
+        match self.protocol_key_pair.keypair() {
             IotaKeyPair::Ed25519(kp) => kp,
             other => panic!(
                 "Invalid keypair type: {:?}, only Ed25519 is allowed for worker key",
@@ -393,7 +393,7 @@ impl NodeConfig {
     }
 
     pub fn protocol_public_key(&self) -> AuthorityPublicKeyBytes {
-        self.protocol_key_pair().public().into()
+        self.authority_key_pair().public().into()
     }
 
     pub fn db_path(&self) -> PathBuf {
@@ -1167,17 +1167,17 @@ mod tests {
 
     #[test]
     fn load_key_pairs_to_node_config() {
-        let protocol_key_pair: AuthorityKeyPair =
+        let authority_key_pair: AuthorityKeyPair =
             get_key_pair_from_rng(&mut StdRng::from_seed([0; 32])).1;
-        let worker_key_pair: NetworkKeyPair =
+        let protocol_key_pair: NetworkKeyPair =
             get_key_pair_from_rng(&mut StdRng::from_seed([0; 32])).1;
         let network_key_pair: NetworkKeyPair =
             get_key_pair_from_rng(&mut StdRng::from_seed([0; 32])).1;
 
-        write_authority_keypair_to_file(&protocol_key_pair, PathBuf::from("protocol.key")).unwrap();
+        write_authority_keypair_to_file(&authority_key_pair, PathBuf::from("authority.key")).unwrap();
         write_keypair_to_file(
-            &IotaKeyPair::Ed25519(worker_key_pair.copy()),
-            PathBuf::from("worker.key"),
+            &IotaKeyPair::Ed25519(protocol_key_pair.copy()),
+            PathBuf::from("protocol.key"),
         )
         .unwrap();
         write_keypair_to_file(
@@ -1189,16 +1189,16 @@ mod tests {
         const TEMPLATE: &str = include_str!("../data/fullnode-template-with-path.yaml");
         let template: NodeConfig = serde_yaml::from_str(TEMPLATE).unwrap();
         assert_eq!(
-            template.protocol_key_pair().public(),
-            protocol_key_pair.public()
+            template.authority_key_pair().public(),
+            authority_key_pair.public()
         );
         assert_eq!(
             template.network_key_pair().public(),
             network_key_pair.public()
         );
         assert_eq!(
-            template.worker_key_pair().public(),
-            worker_key_pair.public()
+            template.protocol_key_pair().public(),
+            protocol_key_pair.public()
         );
     }
 }

crates/iota-core/src/authority/authority_test_utils.rs

@@ -234,7 +234,7 @@ pub async fn init_state_with_objects<I: IntoIterator<Item = Object>>(
         iota_swarm_config::network_config_builder::ConfigBuilder::new(&dir).build();
     let genesis = network_config.genesis;
     let keypair = network_config.validator_configs[0]
-        .protocol_key_pair()
+        .authority_key_pair()
         .copy();
     init_state_with_objects_and_committee(objects, &genesis, &keypair).await
 }

crates/iota-core/src/authority/test_authority_builder.rs

@@ -139,7 +139,7 @@ impl<'a> TestAuthorityBuilder<'a> {
     pub fn with_network_config(self, config: &'a NetworkConfig, node_idx: usize) -> Self {
         self.with_genesis_and_keypair(
             &config.genesis,
-            config.validator_configs()[node_idx].protocol_key_pair(),
+            config.validator_configs()[node_idx].authority_key_pair(),
         )
     }
 
@@ -216,7 +216,7 @@ impl<'a> TestAuthorityBuilder<'a> {
         let keypair = if let Some(keypair) = self.node_keypair {
             keypair
         } else {
-            config.protocol_key_pair()
+            config.authority_key_pair()
         };
 
         let secret = Arc::pin(keypair.copy());
@@ -342,7 +342,7 @@ impl<'a> TestAuthorityBuilder<'a> {
                 Arc::downgrade(&epoch_store),
                 consensus_client,
                 randomness::Handle::new_stub(),
-                config.protocol_key_pair(),
+                config.authority_key_pair(),
             )
             .await;
             if let Some(randomness_manager) = randomness_manager {

crates/iota-core/src/consensus_manager/mod.rs

@@ -71,7 +71,7 @@ impl ProtocolManager {
         client: Arc<LazyMysticetiClient>,
     ) -> Self {
         Self::Mysticeti(MysticetiManager::new(
-            config.worker_key_pair().copy(),
+            config.protocol_key_pair().copy(),
             config.network_key_pair().copy(),
             consensus_config.db_path().to_path_buf(),
             registry_service.clone(),

crates/iota-core/src/epoch/randomness.rs

@@ -890,7 +890,7 @@ mod tests {
 
             let state = TestAuthorityBuilder::new()
                 .with_protocol_config(protocol_config.clone())
-                .with_genesis_and_keypair(&network_config.genesis, validator.protocol_key_pair())
+                .with_genesis_and_keypair(&network_config.genesis, validator.authority_key_pair())
                 .build()
                 .await;
             let consensus_adapter = Arc::new(ConsensusAdapter::new(
@@ -909,7 +909,7 @@ mod tests {
                 Arc::downgrade(&epoch_store),
                 Box::new(consensus_adapter.clone()),
                 iota_network::randomness::Handle::new_stub(),
-                validator.protocol_key_pair(),
+                validator.authority_key_pair(),
             )
             .await
             .unwrap();
@@ -1022,7 +1022,7 @@ mod tests {
 
             let state = TestAuthorityBuilder::new()
                 .with_protocol_config(protocol_config.clone())
-                .with_genesis_and_keypair(&network_config.genesis, validator.protocol_key_pair())
+                .with_genesis_and_keypair(&network_config.genesis, validator.authority_key_pair())
                 .build()
                 .await;
             let consensus_adapter = Arc::new(ConsensusAdapter::new(
@@ -1041,7 +1041,7 @@ mod tests {
                 Arc::downgrade(&epoch_store),
                 Box::new(consensus_adapter.clone()),
                 iota_network::randomness::Handle::new_stub(),
-                validator.protocol_key_pair(),
+                validator.authority_key_pair(),
             )
             .await
             .unwrap();

crates/iota-core/src/test_utils.rs

@@ -113,7 +113,7 @@ where
         .build();
     let genesis = network_config.genesis;
     let authority_key = network_config.validator_configs[0]
-        .protocol_key_pair()
+        .authority_key_pair()
         .copy();
 
     (genesis, authority_key)
@@ -236,8 +236,8 @@ async fn init_genesis(
         let network_key_pair: NetworkKeyPair = get_key_pair().1;
         let validator_info = ValidatorInfo {
             name: format!("validator-{i}"),
-            protocol_key: authority_name,
-            worker_key: worker_name,
+            authority_key: authority_name,
+            protocol_key: worker_name,
             account_address: IotaAddress::from(&account_key_pair.public()),
             network_key: network_key_pair.public().clone(),
             gas_price: 1,

crates/iota-core/src/unit_tests/authority_tests.rs

@@ -4873,10 +4873,10 @@ async fn test_consensus_message_processed() {
     let genesis = network_config.genesis;
 
     let sec1 = network_config.validator_configs[0]
-        .protocol_key_pair()
+        .authority_key_pair()
         .copy();
     let sec2 = network_config.validator_configs[1]
-        .protocol_key_pair()
+        .authority_key_pair()
         .copy();
 
     let authority1 = init_state_with_objects_and_committee(

crates/iota-core/src/unit_tests/mysticeti_manager_tests.rs

@@ -60,7 +60,7 @@ async fn test_mysticeti_manager() {
 
     let consensus_config = config.consensus_config().unwrap();
     let registry_service = RegistryService::new(Registry::new());
-    let secret = Arc::pin(config.protocol_key_pair().copy());
+    let secret = Arc::pin(config.authority_key_pair().copy());
     let genesis = config.genesis().unwrap();
 
     let state = TestAuthorityBuilder::new()
@@ -73,7 +73,7 @@ async fn test_mysticeti_manager() {
     let client = Arc::new(LazyMysticetiClient::default());
 
     let manager = MysticetiManager::new(
-        config.worker_key_pair().copy(),
+        config.protocol_key_pair().copy(),
         config.network_key_pair().copy(),
         consensus_config.db_path().to_path_buf(),
         registry_service,

crates/iota-core/src/unit_tests/pay_iota_tests.rs

@@ -444,7 +444,7 @@ async fn execute_pay_all_iota(
         )
         .build();
     let genesis = network_config.genesis;
-    let keypair = network_config.validator_configs[0].protocol_key_pair();
+    let keypair = network_config.validator_configs[0].authority_key_pair();
 
     let authority_state = init_state_with_committee(&genesis, keypair).await;
     let rgp = authority_state.reference_gas_price_for_testing().unwrap();

crates/iota-framework-snapshot/manifest.json

@@ -1,6 +1,6 @@
 {
   "1": {
-    "git_revision": "e341f0f217bb-dirty",
+    "git_revision": "cc1e39584c82-dirty",
     "package_ids": [
       "0x0000000000000000000000000000000000000000000000000000000000000001",
       "0x0000000000000000000000000000000000000000000000000000000000000002",