Skip to content

Commit 2136979

Browse files
tsergtserg
committed
simplify imports
1 parent 47d9c6e commit 2136979

14 files changed

+20
-28
lines changed

‎src/tests/abbot/test_abbot.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ mod test_abbot {
77
use opus::interfaces::IGate::{IGateDispatcher, IGateDispatcherTrait};
88
use opus::interfaces::ISentinel::{ISentinelDispatcher, ISentinelDispatcherTrait};
99
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
10-
use opus::tests::abbot::utils::abbot_utils::{AbbotTestConfig, AbbotTestTrove};
11-
use opus::tests::abbot::utils::abbot_utils;
10+
use opus::tests::abbot::utils::{abbot_utils, abbot_utils::{AbbotTestConfig, AbbotTestTrove}};
1211
use opus::tests::common;
1312
use opus::tests::sentinel::utils::sentinel_utils;
1413
use opus::tests::shrine::utils::shrine_utils;

‎src/tests/absorber/test_absorber.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ mod test_absorber {
1111
};
1212
use opus::interfaces::IERC20::{IERC20Dispatcher, IERC20DispatcherTrait};
1313
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
14-
use opus::tests::absorber::utils::absorber_utils::{AbsorberTestConfig, AbsorberRewardsTestConfig};
15-
use opus::tests::absorber::utils::absorber_utils;
14+
use opus::tests::absorber::utils::{absorber_utils, absorber_utils::{AbsorberTestConfig, AbsorberRewardsTestConfig}};
1615
use opus::tests::common::{AddressIntoSpan, RewardPartialEq};
1716
use opus::tests::common;
1817
use opus::tests::purger::utils::purger_utils;

‎src/tests/caretaker/test_caretaker.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ mod test_caretaker {
88
use opus::interfaces::IERC20::{IERC20Dispatcher, IERC20DispatcherTrait};
99
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
1010
use opus::tests::abbot::utils::abbot_utils;
11-
use opus::tests::caretaker::utils::caretaker_utils::CaretakerTestConfig;
12-
use opus::tests::caretaker::utils::caretaker_utils;
11+
use opus::tests::caretaker::utils::{caretaker_utils, caretaker_utils::CaretakerTestConfig};
1312
use opus::tests::common;
1413
use opus::tests::shrine::utils::shrine_utils;
1514
use opus::types::{AssetBalance, Health};

‎src/tests/controller/test_controller.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ mod test_controller {
44
use opus::interfaces::IController::{IControllerDispatcher, IControllerDispatcherTrait};
55
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
66
use opus::tests::common;
7-
use opus::tests::controller::utils::controller_utils::ControllerTestConfig;
8-
use opus::tests::controller::utils::controller_utils;
7+
use opus::tests::controller::utils::{controller_utils, controller_utils::ControllerTestConfig};
98
use opus::tests::shrine::utils::shrine_utils;
109
use snforge_std::{start_prank, start_warp, CheatTarget, spy_events, SpyOn, EventSpy, EventAssertions};
1110
use starknet::get_block_timestamp;

‎src/tests/equalizer/test_equalizer.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ mod test_equalizer {
1010
use opus::interfaces::IEqualizer::{IEqualizerDispatcher, IEqualizerDispatcherTrait};
1111
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
1212
use opus::tests::common;
13-
use opus::tests::equalizer::utils::equalizer_utils::EqualizerTestConfig;
14-
use opus::tests::equalizer::utils::equalizer_utils;
13+
use opus::tests::equalizer::utils::{equalizer_utils, equalizer_utils::EqualizerTestConfig};
1514
use opus::tests::shrine::utils::shrine_utils;
1615
use opus::types::Health;
1716
use snforge_std::{declare, start_prank, stop_prank, CheatTarget, spy_events, SpyOn, EventSpy, EventAssertions};

‎src/tests/external/test_ekubo.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ mod test_ekubo {
1313
IMockEkuboOracleExtensionDispatcher, IMockEkuboOracleExtensionDispatcherTrait, set_next_ekubo_prices
1414
};
1515
use opus::tests::common;
16-
use opus::tests::external::utils::ekubo_utils::EkuboTestConfig;
17-
use opus::tests::external::utils::{ekubo_utils, mock_eth_token_addr};
16+
use opus::tests::external::utils::{ekubo_utils, mock_eth_token_addr, ekubo_utils::EkuboTestConfig};
1817
use opus::utils::ekubo_oracle_adapter::{
1918
ekubo_oracle_adapter_component, IEkuboOracleAdapterDispatcher, IEkuboOracleAdapterDispatcherTrait
2019
};

‎src/tests/external/test_pragma.cairo

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ mod test_pragma {
1717
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
1818
use opus::mock::mock_pragma::{IMockPragmaDispatcher, IMockPragmaDispatcherTrait};
1919
use opus::tests::common;
20-
use opus::tests::external::utils::pragma_utils::PragmaTestConfig;
21-
use opus::tests::external::utils::{mock_eth_token_addr, pepe_token_addr, pragma_utils};
20+
use opus::tests::external::utils::{
21+
mock_eth_token_addr, pepe_token_addr, pragma_utils, pragma_utils::PragmaTestConfig
22+
};
2223
use opus::tests::seer::utils::seer_utils;
2324
use opus::tests::sentinel::utils::sentinel_utils;
2425
use opus::types::pragma::{PragmaPricesResponse, PriceValidityThresholds};

‎src/tests/external/test_pragma_v2.cairo

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ mod test_pragma {
1717
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
1818
use opus::mock::mock_pragma::{IMockPragmaDispatcher, IMockPragmaDispatcherTrait};
1919
use opus::tests::common;
20-
use opus::tests::external::utils::pragma_utils::PragmaV2TestConfig;
21-
use opus::tests::external::utils::{mock_eth_token_addr, pepe_token_addr, pragma_utils};
20+
use opus::tests::external::utils::{
21+
mock_eth_token_addr, pepe_token_addr, pragma_utils, pragma_utils::PragmaV2TestConfig
22+
};
2223
use opus::tests::seer::utils::seer_utils;
2324
use opus::tests::sentinel::utils::sentinel_utils;
2425
use opus::types::pragma::{AggregationMode, PairSettings, PragmaPricesResponse, PriceValidityThresholds};

‎src/tests/external/test_switchboard.cairo

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ mod test_switchboard {
88
use opus::interfaces::ISwitchboard::{ISwitchboardDispatcher, ISwitchboardDispatcherTrait};
99
use opus::mock::mock_switchboard::{IMockSwitchboardDispatcher, IMockSwitchboardDispatcherTrait};
1010
use opus::tests::common;
11-
use opus::tests::external::utils::switchboard_utils::{SwitchboardTestConfig, TIMESTAMP};
12-
use opus::tests::external::utils::{mock_eth_token_addr, switchboard_utils};
11+
use opus::tests::external::utils::{
12+
mock_eth_token_addr, switchboard_utils, switchboard_utils::{SwitchboardTestConfig, TIMESTAMP}
13+
};
1314
use opus::tests::seer::utils::seer_utils::ETH_INIT_PRICE;
1415
use snforge_std::{
1516
start_prank, stop_prank, spy_events, CheatTarget, ContractClassTrait, EventAssertions, EventSpy, SpyOn

‎src/tests/purger/test_purger.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ mod test_purger {
1818
use opus::tests::absorber::utils::absorber_utils;
1919
use opus::tests::common;
2020
use opus::tests::flash_mint::utils::flash_mint_utils;
21-
use opus::tests::purger::utils::purger_utils::PurgerTestConfig;
22-
use opus::tests::purger::utils::purger_utils;
21+
use opus::tests::purger::utils::{purger_utils, purger_utils::PurgerTestConfig};
2322
use opus::tests::shrine::utils::shrine_utils;
2423
use opus::types::{AssetBalance, Health, HealthTrait};
2524
use opus::utils::math::{pow, scale_u128_by_ray};

‎src/tests/receptor/test_receptor.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ mod test_receptor {
99
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
1010
use opus::mock::mock_ekubo_oracle_extension::set_next_ekubo_prices;
1111
use opus::tests::common;
12-
use opus::tests::receptor::utils::receptor_utils::ReceptorTestConfig;
13-
use opus::tests::receptor::utils::receptor_utils;
12+
use opus::tests::receptor::utils::{receptor_utils, receptor_utils::ReceptorTestConfig};
1413
use opus::tests::shrine::utils::shrine_utils;
1514
use opus::types::QuoteTokenInfo;
1615
use opus::utils::ekubo_oracle_adapter::{

‎src/tests/seer/test_seer.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ mod test_seer {
2020
use opus::mock::mock_pragma::{IMockPragmaDispatcher, IMockPragmaDispatcherTrait};
2121
use opus::tests::common;
2222
use opus::tests::external::utils::{pragma_utils, ekubo_utils};
23-
use opus::tests::seer::utils::seer_utils::SeerTestConfig;
24-
use opus::tests::seer::utils::seer_utils;
23+
use opus::tests::seer::utils::{seer_utils, seer_utils::SeerTestConfig};
2524
use opus::tests::sentinel::utils::sentinel_utils;
2625
use opus::tests::shrine::utils::shrine_utils;
2726
use opus::types::pragma::PragmaPricesResponse;

‎src/tests/sentinel/test_sentinel.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ mod test_sentinel {
88
use opus::interfaces::ISentinel::{ISentinelDispatcher, ISentinelDispatcherTrait};
99
use opus::interfaces::IShrine::{IShrineDispatcher, IShrineDispatcherTrait};
1010
use opus::tests::common;
11-
use opus::tests::sentinel::utils::sentinel_utils::SentinelTestConfig;
12-
use opus::tests::sentinel::utils::sentinel_utils;
11+
use opus::tests::sentinel::utils::{sentinel_utils, sentinel_utils::SentinelTestConfig};
1312
use opus::tests::shrine::utils::shrine_utils;
1413
use opus::types::YangSuspensionStatus;
1514
use opus::utils::math::{fixed_point_to_wad, pow};

‎src/tests/transmuter/test_transmuter.cairo

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ mod test_transmuter {
1212
use opus::interfaces::ITransmuter::{ITransmuterV2Dispatcher, ITransmuterV2DispatcherTrait};
1313
use opus::tests::common;
1414
use opus::tests::shrine::utils::shrine_utils;
15-
use opus::tests::transmuter::utils::transmuter_utils::TransmuterTestConfig;
16-
use opus::tests::transmuter::utils::transmuter_utils;
15+
use opus::tests::transmuter::utils::{transmuter_utils, transmuter_utils::TransmuterTestConfig};
1716
use opus::utils::math::{fixed_point_to_wad, pow, wad_to_fixed_point};
1817
use snforge_std::{
1918
declare, CheatTarget, ContractClass, ContractClassTrait, EventAssertions, EventSpy, SpyOn, spy_events,

0 commit comments

Comments
 (0)