@@ -356,25 +356,6 @@ async fn setup_with_fee(mint: Keypair, program_id: &Pubkey, authority: &Pubkey)
356
356
context
357
357
}
358
358
359
- fn test_transfer_fee ( ) -> TransferFee {
360
- TransferFee {
361
- epoch : 0 . into ( ) ,
362
- transfer_fee_basis_points : TEST_FEE_BASIS_POINTS . into ( ) ,
363
- maximum_fee : TEST_MAXIMUM_FEE . into ( ) ,
364
- }
365
- }
366
-
367
- fn test_transfer_fee_config ( ) -> TransferFeeConfig {
368
- let transfer_fee = test_transfer_fee ( ) ;
369
- TransferFeeConfig {
370
- transfer_fee_config_authority : COption :: Some ( Pubkey :: new_unique ( ) ) . try_into ( ) . unwrap ( ) ,
371
- withdraw_withheld_authority : COption :: Some ( Pubkey :: new_unique ( ) ) . try_into ( ) . unwrap ( ) ,
372
- withheld_amount : 0 . into ( ) ,
373
- older_transfer_fee : transfer_fee,
374
- newer_transfer_fee : transfer_fee,
375
- }
376
- }
377
-
378
359
async fn setup_with_confidential_transfers (
379
360
mint : Keypair ,
380
361
program_id : & Pubkey ,
@@ -682,7 +663,18 @@ async fn success_transfer_with_fee() {
682
663
let ( alice_account, bob_account) =
683
664
setup_accounts ( & token_context, Keypair :: new ( ) , Keypair :: new ( ) , alice_amount) . await ;
684
665
685
- let transfer_fee_config = test_transfer_fee_config ( ) ;
666
+ let transfer_fee = TransferFee {
667
+ epoch : 0 . into ( ) ,
668
+ transfer_fee_basis_points : TEST_FEE_BASIS_POINTS . into ( ) ,
669
+ maximum_fee : TEST_MAXIMUM_FEE . into ( ) ,
670
+ } ;
671
+ let transfer_fee_config = TransferFeeConfig {
672
+ transfer_fee_config_authority : COption :: Some ( Pubkey :: new_unique ( ) ) . try_into ( ) . unwrap ( ) ,
673
+ withdraw_withheld_authority : COption :: Some ( Pubkey :: new_unique ( ) ) . try_into ( ) . unwrap ( ) ,
674
+ withheld_amount : 0 . into ( ) ,
675
+ older_transfer_fee : transfer_fee,
676
+ newer_transfer_fee : transfer_fee,
677
+ } ;
686
678
let fee = transfer_fee_config
687
679
. calculate_epoch_fee ( 0 , transfer_amount)
688
680
. unwrap ( ) ;
0 commit comments