Skip to content

Commit 41ae45a

Browse files
xenolissxenoliss
committed
chore(solana): factorize test helper
1 parent 3b1d776 commit 41ae45a

9 files changed

Lines changed: 75 additions & 247 deletions

File tree

‎solana/programs/bridge/src/solana_to_base/instructions/bridge_call.rs‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ mod tests {
105105
common::bridge::Bridge,
106106
instruction::BridgeCall as BridgeCallIx,
107107
solana_to_base::CallType,
108-
test_utils::{setup_bridge_and_svm, TEST_GAS_FEE_RECEIVER},
108+
test_utils::{create_outgoing_message, setup_bridge_and_svm, TEST_GAS_FEE_RECEIVER},
109109
ID,
110110
};
111111

@@ -122,15 +122,7 @@ mod tests {
122122
.unwrap();
123123

124124
// Create outgoing message account
125-
let outgoing_message_salt = [42u8; 32];
126-
let outgoing_message = Pubkey::find_program_address(
127-
&[
128-
OUTGOING_MESSAGE_SEED.as_bytes(),
129-
outgoing_message_salt.as_ref(),
130-
],
131-
&ID,
132-
)
133-
.0;
125+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
134126

135127
// Create test call data
136128
let call = Call {
@@ -215,15 +207,7 @@ mod tests {
215207
.unwrap();
216208

217209
// Create outgoing message account
218-
let outgoing_message_salt = [42u8; 32];
219-
let outgoing_message = Pubkey::find_program_address(
220-
&[
221-
OUTGOING_MESSAGE_SEED.as_bytes(),
222-
outgoing_message_salt.as_ref(),
223-
],
224-
&ID,
225-
)
226-
.0;
210+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
227211

228212
// Create test call data
229213
let call = Call {
@@ -296,15 +280,7 @@ mod tests {
296280
svm.airdrop(&from.pubkey(), LAMPORTS_PER_SOL).unwrap();
297281

298282
// Create outgoing message account
299-
let outgoing_message_salt = [42u8; 32];
300-
let outgoing_message = Pubkey::find_program_address(
301-
&[
302-
OUTGOING_MESSAGE_SEED.as_bytes(),
303-
outgoing_message_salt.as_ref(),
304-
],
305-
&ID,
306-
)
307-
.0;
283+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
308284

309285
// Test parameters
310286
let call = Call {

‎solana/programs/bridge/src/solana_to_base/instructions/bridge_sol.rs‎

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ mod tests {
122122
common::{bridge::Bridge, SOL_VAULT_SEED},
123123
instruction::BridgeSol as BridgeSolIx,
124124
solana_to_base::{Call, CallType, NATIVE_SOL_PUBKEY},
125-
test_utils::{setup_bridge_and_svm, TEST_GAS_FEE_RECEIVER},
125+
test_utils::{create_outgoing_message, setup_bridge_and_svm, TEST_GAS_FEE_RECEIVER},
126126
ID,
127127
};
128128

@@ -135,15 +135,7 @@ mod tests {
135135
svm.airdrop(&from.pubkey(), LAMPORTS_PER_SOL * 5).unwrap();
136136

137137
// Create outgoing message account
138-
let outgoing_message_salt = [42u8; 32];
139-
let outgoing_message = Pubkey::find_program_address(
140-
&[
141-
OUTGOING_MESSAGE_SEED.as_bytes(),
142-
outgoing_message_salt.as_ref(),
143-
],
144-
&ID,
145-
)
146-
.0;
138+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
147139

148140
// Test parameters
149141
let to = [1u8; 20]; // Base address
@@ -243,15 +235,7 @@ mod tests {
243235
svm.airdrop(&from.pubkey(), LAMPORTS_PER_SOL * 5).unwrap();
244236

245237
// Create outgoing message account
246-
let outgoing_message_salt = [42u8; 32];
247-
let outgoing_message = Pubkey::find_program_address(
248-
&[
249-
OUTGOING_MESSAGE_SEED.as_bytes(),
250-
outgoing_message_salt.as_ref(),
251-
],
252-
&ID,
253-
)
254-
.0;
238+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
255239

256240
// Test parameters
257241
let to = [1u8; 20];
@@ -342,15 +326,7 @@ mod tests {
342326
let wrong_gas_fee_receiver = Keypair::new();
343327

344328
// Create outgoing message account
345-
let outgoing_message_salt = [42u8; 32];
346-
let outgoing_message = Pubkey::find_program_address(
347-
&[
348-
OUTGOING_MESSAGE_SEED.as_bytes(),
349-
outgoing_message_salt.as_ref(),
350-
],
351-
&ID,
352-
)
353-
.0;
329+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
354330

355331
// Test parameters
356332
let to = [1u8; 20];
@@ -428,15 +404,7 @@ mod tests {
428404
svm.airdrop(&from.pubkey(), LAMPORTS_PER_SOL * 5).unwrap();
429405

430406
// Create outgoing message account
431-
let outgoing_message_salt = [42u8; 32];
432-
let outgoing_message = Pubkey::find_program_address(
433-
&[
434-
OUTGOING_MESSAGE_SEED.as_bytes(),
435-
outgoing_message_salt.as_ref(),
436-
],
437-
&ID,
438-
)
439-
.0;
407+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
440408

441409
// Test parameters
442410
let to = [1u8; 20];

‎solana/programs/bridge/src/solana_to_base/instructions/bridge_spl.rs‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ mod tests {
149149
instruction::BridgeSpl as BridgeSplIx,
150150
solana_to_base::{Call, CallType},
151151
test_utils::{
152-
create_mock_mint, create_mock_token_account, setup_bridge_and_svm,
153-
TEST_GAS_FEE_RECEIVER,
152+
create_mock_mint, create_mock_token_account, create_outgoing_message,
153+
setup_bridge_and_svm, TEST_GAS_FEE_RECEIVER,
154154
},
155155
ID,
156156
};
@@ -184,15 +184,7 @@ mod tests {
184184
);
185185

186186
// Create outgoing message account
187-
let outgoing_message_salt = [42u8; 32];
188-
let outgoing_message = Pubkey::find_program_address(
189-
&[
190-
OUTGOING_MESSAGE_SEED.as_bytes(),
191-
outgoing_message_salt.as_ref(),
192-
],
193-
&ID,
194-
)
195-
.0;
187+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
196188

197189
// Test parameters
198190
let to = [1u8; 20]; // Base address
@@ -317,15 +309,7 @@ mod tests {
317309
);
318310

319311
// Create outgoing message account
320-
let outgoing_message_salt = [42u8; 32];
321-
let outgoing_message = Pubkey::find_program_address(
322-
&[
323-
OUTGOING_MESSAGE_SEED.as_bytes(),
324-
outgoing_message_salt.as_ref(),
325-
],
326-
&ID,
327-
)
328-
.0;
312+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
329313

330314
// Test parameters
331315
let to = [1u8; 20];
@@ -442,15 +426,7 @@ mod tests {
442426
);
443427

444428
// Create outgoing message account
445-
let outgoing_message_salt = [42u8; 32];
446-
let outgoing_message = Pubkey::find_program_address(
447-
&[
448-
OUTGOING_MESSAGE_SEED.as_bytes(),
449-
outgoing_message_salt.as_ref(),
450-
],
451-
&ID,
452-
)
453-
.0;
429+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
454430

455431
// Test parameters
456432
let to = [1u8; 20];
@@ -554,15 +530,7 @@ mod tests {
554530
);
555531

556532
// Create outgoing message account
557-
let outgoing_message_salt = [42u8; 32];
558-
let outgoing_message = Pubkey::find_program_address(
559-
&[
560-
OUTGOING_MESSAGE_SEED.as_bytes(),
561-
outgoing_message_salt.as_ref(),
562-
],
563-
&ID,
564-
)
565-
.0;
533+
let (outgoing_message_salt, outgoing_message) = create_outgoing_message();
566534

567535
// Test parameters
568536
let to = [1u8; 20];

‎solana/programs/bridge/src/solana_to_base/instructions/bridge_wrapped_token.rs‎

Lines changed: 23 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ use anchor_spl::{
77
use crate::{
88
common::{bridge::Bridge, BRIDGE_SEED, DISCRIMINATOR_LEN},
99
solana_to_base::{
10-
internal::bridge_wrapped_token::bridge_wrapped_token_internal, Call, OutgoingMessage, Transfer, OUTGOING_MESSAGE_SEED,
10+
internal::bridge_wrapped_token::bridge_wrapped_token_internal, Call, OutgoingMessage,
11+
Transfer, OUTGOING_MESSAGE_SEED,
1112
},
1213
};
1314

@@ -81,7 +82,10 @@ pub fn bridge_wrapped_token_handler(
8182
call: Option<Call>,
8283
) -> Result<()> {
8384
// Check if bridge is paused
84-
require!(!ctx.accounts.bridge.paused, BridgeWrappedTokenError::BridgePaused);
85+
require!(
86+
!ctx.accounts.bridge.paused,
87+
BridgeWrappedTokenError::BridgePaused
88+
);
8589

8690
bridge_wrapped_token_internal(
8791
&ctx.accounts.payer,
@@ -127,7 +131,7 @@ mod tests {
127131
instruction::BridgeWrappedToken as BridgeWrappedTokenIx,
128132
solana_to_base::{Call, CallType},
129133
test_utils::{
130-
create_mock_wrapped_mint, create_mock_token_account, setup_bridge_and_svm,
134+
create_mock_token_account, create_mock_wrapped_mint, create_outgoing_message, setup_bridge_and_svm,
131135
TEST_GAS_FEE_RECEIVER,
132136
},
133137
ID,
@@ -141,8 +145,6 @@ mod tests {
141145
let from = Keypair::new();
142146
svm.airdrop(&from.pubkey(), LAMPORTS_PER_SOL * 5).unwrap();
143147

144-
145-
146148
// Create test wrapped token metadata
147149
let partial_token_metadata = PartialTokenMetadata {
148150
name: "Test Token".to_string(),
@@ -153,7 +155,8 @@ mod tests {
153155

154156
// Create wrapped token mint
155157
let initial_amount = 1_000_000u64; // 1 token with 6 decimals
156-
let wrapped_mint = create_mock_wrapped_mint(&mut svm, initial_amount, 6, &partial_token_metadata);
158+
let wrapped_mint =
159+
create_mock_wrapped_mint(&mut svm, initial_amount, 6, &partial_token_metadata);
157160

158161
// Create token account for the from user
159162
let from_token_account = Keypair::new().pubkey();
@@ -166,15 +169,8 @@ mod tests {
166169
);
167170

168171
// Create outgoing message account
169-
let outgoing_message_salt = [42u8; 32];
170-
let outgoing_message = Pubkey::find_program_address(
171-
&[
172-
OUTGOING_MESSAGE_SEED.as_bytes(),
173-
outgoing_message_salt.as_ref(),
174-
],
175-
&ID,
176-
)
177-
.0;
172+
let (outgoing_message_salt, outgoing_message) =
173+
create_outgoing_message();
178174

179175
// Test parameters
180176
let to = [1u8; 20]; // Base address
@@ -272,7 +268,8 @@ mod tests {
272268

273269
// Create wrapped token mint
274270
let initial_amount = 1_000_000u64; // 1 token with 6 decimals
275-
let wrapped_mint = create_mock_wrapped_mint(&mut svm, initial_amount, 6, &partial_token_metadata);
271+
let wrapped_mint =
272+
create_mock_wrapped_mint(&mut svm, initial_amount, 6, &partial_token_metadata);
276273

277274
// Create token account for the from user
278275
let from_token_account = Keypair::new().pubkey();
@@ -285,15 +282,8 @@ mod tests {
285282
);
286283

287284
// Create outgoing message account
288-
let outgoing_message_salt = [42u8; 32];
289-
let outgoing_message = Pubkey::find_program_address(
290-
&[
291-
OUTGOING_MESSAGE_SEED.as_bytes(),
292-
outgoing_message_salt.as_ref(),
293-
],
294-
&ID,
295-
)
296-
.0;
285+
let (outgoing_message_salt, outgoing_message) =
286+
create_outgoing_message();
297287

298288
// Test parameters
299289
let to = [1u8; 20];
@@ -389,7 +379,8 @@ mod tests {
389379

390380
// Create wrapped token mint
391381
let initial_amount = 1_000_000u64; // 1 token with 6 decimals
392-
let wrapped_mint = create_mock_wrapped_mint(&mut svm, initial_amount, 6, &partial_token_metadata);
382+
let wrapped_mint =
383+
create_mock_wrapped_mint(&mut svm, initial_amount, 6, &partial_token_metadata);
393384

394385
// Create token account for the from user
395386
let from_token_account = Keypair::new().pubkey();
@@ -402,15 +393,8 @@ mod tests {
402393
);
403394

404395
// Create outgoing message account
405-
let outgoing_message_salt = [42u8; 32];
406-
let outgoing_message = Pubkey::find_program_address(
407-
&[
408-
OUTGOING_MESSAGE_SEED.as_bytes(),
409-
outgoing_message_salt.as_ref(),
410-
],
411-
&ID,
412-
)
413-
.0;
396+
let (outgoing_message_salt, outgoing_message) =
397+
create_outgoing_message();
414398

415399
// Test parameters
416400
let to = [1u8; 20];
@@ -493,7 +477,8 @@ mod tests {
493477

494478
// Create wrapped token mint
495479
let initial_amount = 1_000_000u64;
496-
let wrapped_mint = create_mock_wrapped_mint(&mut svm, initial_amount, 6, &partial_token_metadata);
480+
let wrapped_mint =
481+
create_mock_wrapped_mint(&mut svm, initial_amount, 6, &partial_token_metadata);
497482

498483
// Create token account for the from user
499484
let from_token_account = Keypair::new().pubkey();
@@ -506,15 +491,8 @@ mod tests {
506491
);
507492

508493
// Create outgoing message account
509-
let outgoing_message_salt = [42u8; 32];
510-
let outgoing_message = Pubkey::find_program_address(
511-
&[
512-
OUTGOING_MESSAGE_SEED.as_bytes(),
513-
outgoing_message_salt.as_ref(),
514-
],
515-
&ID,
516-
)
517-
.0;
494+
let (outgoing_message_salt, outgoing_message) =
495+
create_outgoing_message();
518496

519497
// Test parameters
520498
let to = [1u8; 20];

0 commit comments

Comments
 (0)