From 88fe6db52b0bebbd4e7ff9deefe5383371e6d82c Mon Sep 17 00:00:00 2001
From: ananas <jorrit@lightprotocol.com>
Date: Tue, 28 Oct 2025 17:51:21 +0000
Subject: [PATCH] perf: ctoken remove return value of
 verify_owner_or_delegate_signer

---
 .../compressed-token/program/src/shared/owner_validation.rs | 6 +++---
 programs/compressed-token/program/src/shared/token_input.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/compressed-token/program/src/shared/owner_validation.rs b/programs/compressed-token/program/src/shared/owner_validation.rs
index 42d9b42afc..49dcda0df9 100644
--- a/programs/compressed-token/program/src/shared/owner_validation.rs
+++ b/programs/compressed-token/program/src/shared/owner_validation.rs
@@ -11,7 +11,7 @@ use pinocchio::account_info::AccountInfo;
 pub fn verify_owner_or_delegate_signer<'a>(
     owner_account: &'a AccountInfo,
     delegate_account: Option<&'a AccountInfo>,
-) -> Result<Option<&'a AccountInfo>, ProgramError> {
+) -> Result<(), ProgramError> {
     if let Some(delegate_account) = delegate_account {
         // If delegate is used, delegate or owner must be signer
         match check_signer(delegate_account) {
@@ -35,7 +35,7 @@ pub fn verify_owner_or_delegate_signer<'a>(
                 })?;
             }
         }
-        Ok(Some(delegate_account))
+        Ok(())
     } else {
         // If no delegate, owner must be signer
         check_signer(owner_account).map_err(|e| {
@@ -46,7 +46,7 @@ pub fn verify_owner_or_delegate_signer<'a>(
             anchor_lang::solana_program::msg!("Owner signer check failed: {:?}", e);
             ProgramError::from(e)
         })?;
-        Ok(None)
+        Ok(())
     }
 }
 
diff --git a/programs/compressed-token/program/src/shared/token_input.rs b/programs/compressed-token/program/src/shared/token_input.rs
index bdcba1ab76..decd9f7426 100644
--- a/programs/compressed-token/program/src/shared/token_input.rs
+++ b/programs/compressed-token/program/src/shared/token_input.rs
@@ -84,7 +84,7 @@ fn set_input_compressed_account_inner<const IS_FROZEN: bool>(
         None
     };
 
-    let verified_delegate = verify_owner_or_delegate_signer(owner_account, delegate_account)?;
+    verify_owner_or_delegate_signer(owner_account, delegate_account)?;
     let token_version = TokenDataVersion::try_from(input_token_data.version)?;
     let mint_account = &accounts
         .get(input_token_data.mint as usize)
@@ -119,7 +119,7 @@ fn set_input_compressed_account_inner<const IS_FROZEN: bool>(
                     token_version.serialize_amount_bytes(input_token_data.amount.into())?;
 
                 let hashed_delegate =
-                    verified_delegate.map(|delegate| hash_cache.get_or_hash_pubkey(delegate.key()));
+                    delegate_account.map(|delegate| hash_cache.get_or_hash_pubkey(delegate.key()));
 
                 if !IS_FROZEN {
                     TokenData::hash_with_hashed_values(