refactor: simplify

Signed-off-by: Pablo Maldonado <[email protected]>

Author: md0x

programs/svm-spoke/src/instructions/deposit.rs

@@ -12,8 +12,8 @@ use crate::{
     event::FundsDeposited,
     state::{Route, State},
     utils::{
-        derive_deposit_now_seed_hash, derive_deposit_seed_hash, get_current_time, get_unsafe_deposit_id, transfer_from,
-        DepositNowSeedData, DepositSeedData,
+        derive_deposit_seed_hash, get_current_time, get_unsafe_deposit_id, transfer_from, DepositNowSeedData,
+        DepositSeedData,
     },
 };
 
@@ -223,7 +223,7 @@ pub fn deposit_now(
 ) -> Result<()> {
     let state = &mut ctx.accounts.state;
     let current_time = get_current_time(state)?;
-    let seed_hash = derive_deposit_now_seed_hash(
+    let seed_hash = derive_deposit_seed_hash(
         &(DepositNowSeedData {
             depositor,
             recipient,

programs/svm-spoke/src/instructions/fill.rs

@@ -11,7 +11,7 @@ use crate::{
     error::{CommonError, SvmError},
     event::{FillType, FilledRelay, RelayExecutionEventInfo},
     state::{FillRelayParams, FillStatus, FillStatusAccount, State},
-    utils::{derive_fill_delegate_seed_hash, get_current_time, hash_non_empty_message, invoke_handler, transfer_from},
+    utils::{derive_fill_seed_hash, get_current_time, hash_non_empty_message, invoke_handler, transfer_from},
 };
 
 #[event_cpi]
@@ -32,7 +32,7 @@ pub struct FillRelay<'info> {
     )]
     pub state: Account<'info, State>,
 
-    /// CHECK: PDA derived with seeds ["delegate", fill_delegate_seed_hash]; used as a CPI signer.
+    /// CHECK: PDA derived with seeds ["delegate", fill_seed_hash]; used as a CPI signer.
     pub delegate: UncheckedAccount<'info>,
 
     #[account(
@@ -119,7 +119,7 @@ pub fn fill_relay<'info>(
     };
 
     // Verify delegate PDA
-    let seed_hash = derive_fill_delegate_seed_hash(relay_hash, repayment_chain_id, repayment_address);
+    let seed_hash = derive_fill_seed_hash(relay_hash, repayment_chain_id, repayment_address);
     let (pda, bump) = Pubkey::find_program_address(&[b"delegate", &seed_hash], &ctx.program_id);
     if ctx.accounts.delegate.key() != pda {
         return err!(SvmError::InvalidDelegatePda);

programs/svm-spoke/src/utils/deposit_utils.rs

@@ -41,16 +41,8 @@ pub struct DepositNowSeedData {
     pub message: Vec<u8>,
 }
 
-pub fn derive_seed_hash<T: AnchorSerialize>(seed: &T) -> [u8; 32] {
+pub fn derive_deposit_seed_hash<T: AnchorSerialize>(seed: &T) -> [u8; 32] {
     let mut buf = Vec::with_capacity(128);
     seed.serialize(&mut buf).unwrap();
     keccak::hash(&buf).to_bytes()
 }
-
-pub fn derive_deposit_seed_hash(args: &DepositSeedData) -> [u8; 32] {
-    derive_seed_hash(args)
-}
-
-pub fn derive_deposit_now_seed_hash(args: &DepositNowSeedData) -> [u8; 32] {
-    derive_seed_hash(args)
-}

programs/svm-spoke/src/utils/fill_utils.rs

@@ -7,11 +7,7 @@ struct FillDelegateSeedData {
     repayment_address: Pubkey,
 }
 
-pub fn derive_fill_delegate_seed_hash(
-    relay_hash: [u8; 32],
-    repayment_chain_id: u64,
-    repayment_address: Pubkey,
-) -> [u8; 32] {
+pub fn derive_fill_seed_hash(relay_hash: [u8; 32], repayment_chain_id: u64, repayment_address: Pubkey) -> [u8; 32] {
     let data_struct = FillDelegateSeedData { relay_hash, repayment_chain_id, repayment_address };
     let serialized = data_struct.try_to_vec().unwrap();