fix lint for tests

Author: tserg

src/tests/purger/test_purger.cairo

@@ -28,6 +28,8 @@ mod test_purger {
     use starknet::{ContractAddress, get_block_timestamp};
     use wadray::{RAY_ONE, RAY_PERCENT, Ray, WAD_ONE, Wad};
 
+    const BOOL_PARAMETRIZED: [bool; 2] = [true, false];
+
     //
     // Tests - Setup
     //
@@ -849,16 +851,14 @@ mod test_purger {
         ]
             .span();
 
-        let is_recovery_mode_fuzz: Span<bool> = array![false, true].span();
-
         for threshold in interesting_thresholds {
             let mut target_ltv_arr = *target_ltvs.pop_front().unwrap();
             let target_ltv = *target_ltv_arr.pop_front().unwrap();
 
             let expected_max_close_amt = *expected_max_close_amts.pop_front().unwrap();
             let expected_rm_max_close_amt_lower_bound = *expected_rm_max_close_amts_lower_bound.pop_front().unwrap();
 
-            for is_recovery_mode in is_recovery_mode_fuzz {
+            for is_recovery_mode in BOOL_PARAMETRIZED.span() {
                 let PurgerTestConfig {
                     shrine, abbot, seer, absorber, purger, yangs, gates,
                 } = purger_utils::purger_deploy(classes);
@@ -1064,8 +1064,6 @@ mod test_purger {
         let classes = Option::Some(purger_utils::declare_contracts());
 
         let target_trove_yang_asset_amts_cases = purger_utils::interesting_yang_amts_for_redistributed_trove();
-        let is_recovery_mode_fuzz: Span<bool> = array![false, true].span();
-        let kill_absorber_fuzz: Span<bool> = array![true, false].span();
 
         for target_trove_yang_asset_amts in target_trove_yang_asset_amts_cases {
             let recipient_trove_yang_asset_amts_cases = recipient_trove_yang_asset_amts_param;
@@ -1076,8 +1074,8 @@ mod test_purger {
                 );
 
                 for absorber_start_yin in absorber_yin_cases {
-                    for is_recovery_mode in is_recovery_mode_fuzz {
-                        for kill_absorber in kill_absorber_fuzz {
+                    for is_recovery_mode in BOOL_PARAMETRIZED.span() {
+                        for kill_absorber in BOOL_PARAMETRIZED.span() {
                             let PurgerTestConfig {
                                 shrine, abbot, seer, absorber, purger, yangs, gates,
                             } = purger_utils::purger_deploy(classes);
@@ -1490,12 +1488,10 @@ mod test_purger {
             let mut absorber_start_yin: Wad = if absorber_yin_idx == 0 {
                 // Fund the absorber with 1/3 of the max close amount
                 (max_close_amt.into() / 3_u128).into()
+            } else if absorber_yin_idx == 1 {
+                minimum_operational_shares
             } else {
-                if absorber_yin_idx == 1 {
-                    minimum_operational_shares
-                } else {
-                    max_close_amt - 1_u128.into()
-                }
+                max_close_amt - 1_u128.into()
             };
 
             let close_amt = absorber_start_yin;
@@ -2584,12 +2580,11 @@ mod test_purger {
 
         let target_trove_yang_asset_amts_cases = purger_utils::interesting_yang_amts_for_redistributed_trove();
         let absorber_yin_cases: Span<Wad> = purger_utils::inoperational_absorber_yin_cases();
-        let kill_absorber_fuzz: Span<bool> = array![true, false].span();
 
         for target_trove_yang_asset_amts in target_trove_yang_asset_amts_cases {
             for yang_asset_amts in recipient_trove_yang_asset_amts {
                 for absorber_start_yin in absorber_yin_cases {
-                    for kill_absorber in kill_absorber_fuzz {
+                    for kill_absorber in BOOL_PARAMETRIZED.span() {
                         let PurgerTestConfig {
                             shrine, abbot, seer, absorber, purger, yangs, gates,
                         } = purger_utils::purger_deploy(classes);

src/tests/shrine/test_shrine.cairo

@@ -1880,10 +1880,10 @@ mod test_shrine {
         // Manually set the prices
         let yang1_price: Wad = 2500000000000000000000_u128.into(); // 2_500 (Wad)
         let yang2_price: Wad = 625000000000000000000_u128.into(); // 625 (Wad)
-        let mut yang_prices: Array<Wad> = array![yang1_price, yang2_price];
+        let yang_prices: Span<Wad> = array![yang1_price, yang2_price].span();
 
         let mut yangs: Span<ContractAddress> = shrine_utils::two_yang_addrs();
-        let mut yang_prices_copy: Span<Wad> = yang_prices.span();
+        let mut yang_prices_copy = yang_prices;
 
         start_cheat_caller_address(shrine.contract_address, shrine_utils::ADMIN);
         for yang_amt in yang_amts {
@@ -1892,12 +1892,13 @@ mod test_shrine {
 
             shrine.advance(yang, *yang_prices_copy.pop_front().unwrap());
         }
-        let mut yang_thresholds: Array<Ray> = array![
+        let yang_thresholds: Span<Ray> = array![
             shrine_utils::YANG1_THRESHOLD.into(), shrine_utils::YANG2_THRESHOLD.into(),
-        ];
+        ]
+            .span();
 
         let (expected_threshold, expected_value) = shrine_utils::calculate_trove_threshold_and_value(
-            yang_prices.span(), yang_amts.span(), yang_thresholds.span(),
+            yang_prices, yang_amts, yang_thresholds,
         );
         let trove_health: Health = shrine.get_trove_health(common::TROVE_1);
         assert(trove_health.threshold == expected_threshold, 'wrong threshold');
@@ -1928,28 +1929,24 @@ mod test_shrine {
     fn test_get_shrine_health() {
         let shrine: IShrineDispatcher = shrine_utils::shrine_setup_with_feed(Option::None);
 
-        let yang1_addr: ContractAddress = shrine_utils::YANG1_ADDR;
-        let yang2_addr: ContractAddress = shrine_utils::YANG2_ADDR;
-
-        let mut yangs: Array<ContractAddress> = array![yang1_addr, yang2_addr];
-
-        let mut yang_amts: Array<Wad> = array![
+        let mut yangs: Span<ContractAddress> = shrine_utils::two_yang_addrs();
+        let yang_amts: Span<Wad> = array![
             shrine_utils::TROVE1_YANG1_DEPOSIT.into(), shrine_utils::TROVE1_YANG2_DEPOSIT.into(),
-        ];
+        ]
+            .span();
 
         // Manually set the prices
         let yang1_price: Wad = 2500000000000000000000_u128.into(); // 2_500 (Wad)
         let yang2_price: Wad = 625000000000000000000_u128.into(); // 625 (Wad)
         let mut yang_prices: Array<Wad> = array![yang1_price, yang2_price];
 
-        let mut yangs_copy: Span<ContractAddress> = yangs.span();
         let mut yang_prices_copy: Span<Wad> = yang_prices.span();
 
         // Deposit into troves 1 and 2, with trove 2 getting twice
         // the amount of trove 1
         start_cheat_caller_address(shrine.contract_address, shrine_utils::ADMIN);
         for yang_amt in yang_amts {
-            let yang: ContractAddress = *yangs_copy.pop_front().unwrap();
+            let yang: ContractAddress = *yangs.pop_front().unwrap();
             shrine.deposit(yang, common::TROVE_1, *yang_amt);
             // Deposit twice the amount into trove 2
             shrine.deposit(yang, common::TROVE_2, *yang_amt * (2 * WAD_ONE).into());