@@ -72,16 +72,8 @@ async fn setup_accounts(
72
72
73
73
fn setup_program_test ( program_id : & Pubkey ) -> ProgramTest {
74
74
let mut program_test = ProgramTest :: default ( ) ;
75
- program_test. add_program (
76
- "spl_token_2022" ,
77
- spl_token_2022:: id ( ) ,
78
- None ,
79
- ) ;
80
- program_test. add_program (
81
- "spl_transfer_hook_example" ,
82
- * program_id,
83
- None ,
84
- ) ;
75
+ program_test. add_program ( "spl_token_2022" , spl_token_2022:: id ( ) , None ) ;
76
+ program_test. add_program ( "spl_transfer_hook_example" , * program_id, None ) ;
85
77
program_test
86
78
}
87
79
@@ -253,11 +245,7 @@ async fn success_init() {
253
245
#[ tokio:: test]
254
246
async fn fail_init_all_none ( ) {
255
247
let mut program_test = ProgramTest :: default ( ) ;
256
- program_test. add_program (
257
- "spl_token_2022" ,
258
- spl_token_2022:: id ( ) ,
259
- None ,
260
- ) ;
248
+ program_test. add_program ( "spl_token_2022" , spl_token_2022:: id ( ) , None ) ;
261
249
let context = program_test. start_with_context ( ) . await ;
262
250
let context = Arc :: new ( tokio:: sync:: Mutex :: new ( context) ) ;
263
251
let mut context = TestContext {
@@ -582,16 +570,8 @@ async fn fail_transfer_hook_program() {
582
570
let program_id = Pubkey :: new_unique ( ) ;
583
571
let mint = Keypair :: new ( ) ;
584
572
let mut program_test = ProgramTest :: default ( ) ;
585
- program_test. add_program (
586
- "spl_token_2022" ,
587
- spl_token_2022:: id ( ) ,
588
- None ,
589
- ) ;
590
- program_test. add_program (
591
- "spl_transfer_hook_example_fail" ,
592
- program_id,
593
- None ,
594
- ) ;
573
+ program_test. add_program ( "spl_token_2022" , spl_token_2022:: id ( ) , None ) ;
574
+ program_test. add_program ( "spl_transfer_hook_example_fail" , program_id, None ) ;
595
575
let validation_address = get_extra_account_metas_address ( & mint. pubkey ( ) , & program_id) ;
596
576
program_test. add_account (
597
577
validation_address,
@@ -650,16 +630,8 @@ async fn success_downgrade_writable_and_signer_accounts() {
650
630
let program_id = Pubkey :: new_unique ( ) ;
651
631
let mint = Keypair :: new ( ) ;
652
632
let mut program_test = ProgramTest :: default ( ) ;
653
- program_test. add_program (
654
- "spl_token_2022" ,
655
- spl_token_2022:: id ( ) ,
656
- None ,
657
- ) ;
658
- program_test. add_program (
659
- "spl_transfer_hook_example_downgrade" ,
660
- program_id,
661
- None ,
662
- ) ;
633
+ program_test. add_program ( "spl_token_2022" , spl_token_2022:: id ( ) , None ) ;
634
+ program_test. add_program ( "spl_transfer_hook_example_downgrade" , program_id, None ) ;
663
635
let alice = Keypair :: new ( ) ;
664
636
let alice_account = Keypair :: new ( ) ;
665
637
let validation_address = get_extra_account_metas_address ( & mint. pubkey ( ) , & program_id) ;
@@ -735,11 +707,7 @@ async fn success_transfers_using_onchain_helper() {
735
707
736
708
let swap_program_id = Pubkey :: new_unique ( ) ;
737
709
let mut program_test = setup_program_test ( & program_id) ;
738
- program_test. add_program (
739
- "spl_transfer_hook_example_swap" ,
740
- swap_program_id,
741
- None ,
742
- ) ;
710
+ program_test. add_program ( "spl_transfer_hook_example_swap" , swap_program_id, None ) ;
743
711
add_validation_account ( & mut program_test, & mint_a, & program_id) ;
744
712
add_validation_account ( & mut program_test, & mint_b, & program_id) ;
745
713
@@ -1100,16 +1068,8 @@ async fn success_without_validation_account() {
1100
1068
let program_id = Pubkey :: new_unique ( ) ;
1101
1069
let mint = Keypair :: new ( ) ;
1102
1070
let mut program_test = ProgramTest :: default ( ) ;
1103
- program_test. add_program (
1104
- "spl_token_2022" ,
1105
- spl_token_2022:: id ( ) ,
1106
- None ,
1107
- ) ;
1108
- program_test. add_program (
1109
- "spl_transfer_hook_example_success" ,
1110
- program_id,
1111
- None ,
1112
- ) ;
1071
+ program_test. add_program ( "spl_token_2022" , spl_token_2022:: id ( ) , None ) ;
1072
+ program_test. add_program ( "spl_transfer_hook_example_success" , program_id, None ) ;
1113
1073
let context = program_test. start_with_context ( ) . await ;
1114
1074
let context = Arc :: new ( tokio:: sync:: Mutex :: new ( context) ) ;
1115
1075
let mut context = TestContext {
0 commit comments