Skip to content

Commit 410c01a

Browse files
committed
refactor: simplify
Signed-off-by: Pablo Maldonado <[email protected]>
1 parent 5d34e89 commit 410c01a

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

Diff for: programs/svm-spoke/src/instructions/deposit.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ use crate::{
1212
event::FundsDeposited,
1313
state::{Route, State},
1414
utils::{
15-
derive_deposit_now_seed_hash, derive_deposit_seed_hash, get_current_time, get_unsafe_deposit_id, transfer_from,
16-
DepositNowSeedData, DepositSeedData,
15+
derive_seed_hash, get_current_time, get_unsafe_deposit_id, transfer_from, DepositNowSeedData, DepositSeedData,
1716
},
1817
};
1918

@@ -170,7 +169,7 @@ pub fn deposit(
170169
exclusivity_parameter: u32,
171170
message: Vec<u8>,
172171
) -> Result<()> {
173-
let seed_hash = derive_deposit_seed_hash(
172+
let seed_hash = derive_seed_hash(
174173
&(DepositSeedData {
175174
depositor,
176175
recipient,
@@ -223,7 +222,7 @@ pub fn deposit_now(
223222
) -> Result<()> {
224223
let state = &mut ctx.accounts.state;
225224
let current_time = get_current_time(state)?;
226-
let seed_hash = derive_deposit_now_seed_hash(
225+
let seed_hash = derive_seed_hash(
227226
&(DepositNowSeedData {
228227
depositor,
229228
recipient,
@@ -277,7 +276,7 @@ pub fn unsafe_deposit(
277276
) -> Result<()> {
278277
// Calculate the unsafe deposit ID as a [u8; 32]
279278
let deposit_id = get_unsafe_deposit_id(ctx.accounts.signer.key(), depositor, deposit_nonce);
280-
let seed_hash = derive_deposit_seed_hash(
279+
let seed_hash = derive_seed_hash(
281280
&(DepositSeedData {
282281
depositor,
283282
recipient,

Diff for: programs/svm-spoke/src/utils/deposit_utils.rs

-8
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,3 @@ pub fn derive_seed_hash<T: AnchorSerialize>(seed: &T) -> [u8; 32] {
4646
seed.serialize(&mut buf).unwrap();
4747
keccak::hash(&buf).to_bytes()
4848
}
49-
50-
pub fn derive_deposit_seed_hash(args: &DepositSeedData) -> [u8; 32] {
51-
derive_seed_hash(args)
52-
}
53-
54-
pub fn derive_deposit_now_seed_hash(args: &DepositNowSeedData) -> [u8; 32] {
55-
derive_seed_hash(args)
56-
}

0 commit comments

Comments
 (0)