Apply suggestions from code review

Co-authored-by: Hansie Odendaal <39146854+hansieodendaal@users.noreply.github.com>
tari-project · Jul 18, 2024 · 6ccfd12 · 6ccfd12
1 parent 8cbea8d
commit 6ccfd12
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/base_layer/core/src/blocks/faucets/mod.rs b/base_layer/core/src/blocks/faucets/mod.rs
@@ -84,15 +84,15 @@ mod test {
         let mut total_private_key = PrivateKey::default();
 
         for _ in 0..num_faucets {
-            let (commitment_mask_key_id, script_key) =
+            let (commitment_mask, script_key) =
                 key_manager.get_next_commitment_mask_and_script_key().await.unwrap();
             total_private_key = total_private_key +
                 &key_manager
-                    .get_private_key(&commitment_mask_key_id.key_id)
+                    .get_private_key(&commitment_mask.key_id)
                     .await
                     .unwrap();
             let commitment = key_manager
-                .get_commitment(&commitment_mask_key_id.key_id, &amount.into())
+                .get_commitment(&commitment_mask.key_id, &amount.into())
                 .await
                 .unwrap();
             let com_hash: [u8; 32] = DomainSeparatedConsensusHasher::<FaucetHashDomain, Blake2b<U32>>::new("com_hash")

diff --git a/base_layer/core/src/transactions/test_helpers.rs b/base_layer/core/src/transactions/test_helpers.rs
@@ -114,15 +114,15 @@ impl TestParams {
         key_manager: &TransactionKeyManagerWrapper<KeyManagerSqliteDatabase<TKeyManagerDbConnection>>,
     ) -> TestParams {
         let (commitment_mask_key, script_key) = key_manager.get_next_commitment_mask_and_script_key().await.unwrap();
-        let sender_offset_key = key_manager
+        let sender_offset = key_manager
             .get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
             .await
             .unwrap();
-        let kernel_nonce_key = key_manager
+        let kernel_nonce = key_manager
             .get_next_key(TransactionKeyManagerBranch::KernelNonce.get_branch_key())
             .await
             .unwrap();
-        let public_nonce_key = key_manager
+        let public_noncey = key_manager
             .get_next_key(TransactionKeyManagerBranch::Nonce.get_branch_key())
             .await
             .unwrap();
@@ -725,11 +725,11 @@ pub async fn create_stx_protocol_internal(
         stx_builder.with_input(tx_input.clone()).await.unwrap();
     }
     for val in schema.to {
-        let commitment_mask_key = key_manager
+        let commitment_mask = key_manager
             .get_next_key(TransactionKeyManagerBranch::CommitmentMask.get_branch_key())
             .await
             .unwrap();
-        let sender_offset_key = key_manager
+        let sender_offset = key_manager
             .get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
             .await
             .unwrap();
@@ -769,7 +769,7 @@ pub async fn create_stx_protocol_internal(
         stx_builder.with_output(output, sender_offset_key.key_id).await.unwrap();
     }
     for mut utxo in schema.to_outputs {
-        let sender_offset_key = key_manager
+        let sender_offset = key_manager
             .get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
             .await
             .unwrap();
@@ -853,15 +853,15 @@ pub async fn create_utxo(
     covenant: &Covenant,
     minimum_value_promise: MicroMinotari,
 ) -> (TransactionOutput, TariKeyId, TariKeyId) {
-    let commitment_mask_key = key_manager
+    let commitment_mask = key_manager
         .get_next_key(TransactionKeyManagerBranch::CommitmentMask.get_branch_key())
         .await
         .unwrap();
     let encrypted_data = key_manager
         .encrypt_data_for_recovery(&commitment_mask_key.key_id, None, value.into(), PaymentId::Empty)
         .await
         .unwrap();
-    let sender_offset_key = key_manager
+    let sender_offset = key_manager
         .get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
         .await
         .unwrap();

diff --git a/base_layer/key_manager/src/key_manager_service/interface.rs b/base_layer/key_manager/src/key_manager_service/interface.rs
@@ -58,7 +58,7 @@ pub enum AddResult {
 
 #[derive(Debug, Eq, PartialEq)]
 pub struct KeyAndId<PK> {
-    pub key: PK,
+    pub pub_key: PK,
     pub key_id: KeyId<PK>,
 }