clippy; review fixes

Author: abcalphabet

token/confidential-transfer/proof-extraction/src/encryption.rs

@@ -5,7 +5,6 @@ use {
         grouped_elgamal::{
             PodGroupedElGamalCiphertext2Handles, PodGroupedElGamalCiphertext3Handles,
         },
-        pedersen::PodPedersenCommitment,
     },
 };
 
@@ -14,10 +13,6 @@ use {
 pub struct PodTransferAmountCiphertext(pub(crate) PodGroupedElGamalCiphertext3Handles);
 
 impl PodTransferAmountCiphertext {
-    pub fn extract_commitment(&self) -> PodPedersenCommitment {
-        self.0.extract_commitment()
-    }
-
     pub fn try_extract_ciphertext(
         &self,
         index: usize,
@@ -33,10 +28,6 @@ impl PodTransferAmountCiphertext {
 pub struct PodFeeCiphertext(pub(crate) PodGroupedElGamalCiphertext2Handles);
 
 impl PodFeeCiphertext {
-    pub fn extract_commitment(&self) -> PodPedersenCommitment {
-        self.0.extract_commitment()
-    }
-
     pub fn try_extract_ciphertext(
         &self,
         index: usize,
@@ -52,10 +43,6 @@ impl PodFeeCiphertext {
 pub struct PodBurnAmountCiphertext(pub(crate) PodGroupedElGamalCiphertext3Handles);
 
 impl PodBurnAmountCiphertext {
-    pub fn extract_commitment(&self) -> PodPedersenCommitment {
-        self.0.extract_commitment()
-    }
-
     pub fn try_extract_ciphertext(
         &self,
         index: usize,
@@ -71,10 +58,6 @@ impl PodBurnAmountCiphertext {
 pub struct PodMintAmountCiphertext(pub(crate) PodGroupedElGamalCiphertext3Handles);
 
 impl PodMintAmountCiphertext {
-    pub fn extract_commitment(&self) -> PodPedersenCommitment {
-        self.0.extract_commitment()
-    }
-
     pub fn try_extract_ciphertext(
         &self,
         index: usize,

token/program-2022/src/extension/confidential_mint_burn/processor.rs

@@ -35,7 +35,7 @@ use {
             CiphertextCiphertextEqualityProofContext, CiphertextCiphertextEqualityProofData,
         },
     },
-    spl_pod::optional_keys::OptionalNonZeroPubkey,
+    spl_token_confidential_transfer_proof_extraction::instruction::verify_and_extract_context,
 };
 
 /// Processes an [InitializeMint] instruction.
@@ -95,9 +95,7 @@ fn process_rotate_supply_elgamal_pubkey(
 
     let authority_info = next_account_info(account_info_iter)?;
     let authority_info_data_len = authority_info.data_len();
-
-    let authority = OptionalNonZeroPubkey::try_from(mint_authority)?;
-    let authority = Option::<Pubkey>::from(authority).ok_or(TokenError::NoAuthorityExists)?;
+    let authority = mint_authority.ok_or(TokenError::NoAuthorityExists)?;
 
     Processor::validate_owner(
         program_id,
@@ -121,17 +119,16 @@ fn process_update_decryptable_supply(
 ) -> ProgramResult {
     let account_info_iter = &mut accounts.iter();
     let mint_info = next_account_info(account_info_iter)?;
-    let authority_info = next_account_info(account_info_iter)?;
-    let authority_info_data_len = authority_info.data_len();
 
     check_program_account(mint_info.owner)?;
     let mint_data = &mut mint_info.data.borrow_mut();
     let mut mint = PodStateWithExtensionsMut::<PodMint>::unpack(mint_data)?;
     let mint_authority = mint.base.mint_authority;
     let mint_burn_extension = mint.get_extension_mut::<ConfidentialMintBurn>()?;
 
-    let authority = OptionalNonZeroPubkey::try_from(mint_authority)?;
-    let authority = Option::<Pubkey>::from(authority).ok_or(TokenError::NoAuthorityExists)?;
+    let authority_info = next_account_info(account_info_iter)?;
+    let authority_info_data_len = authority_info.data_len();
+    let authority = mint_authority.ok_or(TokenError::NoAuthorityExists)?;
 
     Processor::validate_owner(
         program_id,
@@ -180,9 +177,7 @@ fn process_confidential_mint(
 
     let authority_info = next_account_info(account_info_iter)?;
     let authority_info_data_len = authority_info.data_len();
-
-    let authority = OptionalNonZeroPubkey::try_from(mint_authority)?;
-    let authority = Option::<Pubkey>::from(authority).ok_or(TokenError::NoAuthorityExists)?;
+    let authority = mint_authority.ok_or(TokenError::NoAuthorityExists)?;
 
     Processor::validate_owner(
         program_id,

token/program-2022/src/instruction.rs

@@ -1122,8 +1122,6 @@ pub enum AuthorityType {
     GroupPointer,
     /// Authority to set the group member address
     GroupMemberPointer,
-    /// Authority to mint new confidential tokens
-    MintConfidentialTokens,
 }
 
 impl AuthorityType {
@@ -1144,7 +1142,6 @@ impl AuthorityType {
             AuthorityType::MetadataPointer => 12,
             AuthorityType::GroupPointer => 13,
             AuthorityType::GroupMemberPointer => 14,
-            AuthorityType::MintConfidentialTokens => 15,
         }
     }
 
@@ -1165,7 +1162,6 @@ impl AuthorityType {
             12 => Ok(AuthorityType::MetadataPointer),
             13 => Ok(AuthorityType::GroupPointer),
             14 => Ok(AuthorityType::GroupMemberPointer),
-            15 => Ok(AuthorityType::MintConfidentialTokens),
             _ => Err(TokenError::InvalidInstruction.into()),
         }
     }

token/program-2022/src/proof.rs

@@ -172,7 +172,9 @@ where
                     )
                 }
             };
-            *expected_instruction_offset += 1;
+            *expected_instruction_offset = expected_instruction_offset
+                .checked_add(1)
+                .ok_or(ProgramError::InvalidInstructionData)?;
             Ok(proof_instruction_offset)
         }
         ProofLocation::ContextStateAccount(context_state_account) => {