Skip to content

Commit 648bf33

Browse files
committed
fix all compiler warnings
1 parent 309fa74 commit 648bf33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+164
-200
lines changed

programs/drift/src/controller/insurance.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ use crate::error::ErrorCode;
1414
use crate::math::amm::calculate_net_user_pnl;
1515
use crate::math::casting::Cast;
1616
use crate::math::constants::{
17-
MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT,
17+
FUEL_START_TS, GOV_SPOT_MARKET_INDEX, MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT,
1818
MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT_GOV, ONE_YEAR, PERCENTAGE_PRECISION,
19-
SHARE_OF_REVENUE_ALLOCATED_TO_INSURANCE_FUND_VAULT_DENOMINATOR,
19+
QUOTE_SPOT_MARKET_INDEX, SHARE_OF_REVENUE_ALLOCATED_TO_INSURANCE_FUND_VAULT_DENOMINATOR,
2020
SHARE_OF_REVENUE_ALLOCATED_TO_INSURANCE_FUND_VAULT_NUMERATOR,
2121
};
2222
use crate::math::fuel::calculate_insurance_fuel_bonus;
@@ -40,7 +40,7 @@ use crate::state::perp_market::PerpMarket;
4040
use crate::state::spot_market::{SpotBalanceType, SpotMarket};
4141
use crate::state::state::State;
4242
use crate::state::user::UserStats;
43-
use crate::{emit, validate, FUEL_START_TS, GOV_SPOT_MARKET_INDEX, QUOTE_SPOT_MARKET_INDEX};
43+
use crate::{emit, validate};
4444

4545
#[cfg(test)]
4646
mod tests;

programs/drift/src/controller/liquidation.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ use crate::error::{DriftResult, ErrorCode};
2121
use crate::math::bankruptcy::is_user_bankrupt;
2222
use crate::math::casting::Cast;
2323
use crate::math::constants::{
24-
LIQUIDATION_FEE_PRECISION_U128, LIQUIDATION_PCT_PRECISION, QUOTE_PRECISION,
25-
QUOTE_PRECISION_I128, QUOTE_PRECISION_U64, QUOTE_SPOT_MARKET_INDEX, SPOT_WEIGHT_PRECISION,
24+
LIQUIDATION_FEE_PRECISION, LIQUIDATION_FEE_PRECISION_U128, LIQUIDATION_PCT_PRECISION,
25+
QUOTE_PRECISION, QUOTE_PRECISION_I128, QUOTE_PRECISION_U64, QUOTE_SPOT_MARKET_INDEX,
26+
SPOT_WEIGHT_PRECISION,
2627
};
2728
use crate::math::liquidation::{
2829
calculate_asset_transfer_for_liability_transfer,
@@ -48,6 +49,7 @@ use crate::math::orders::{
4849
use crate::math::position::calculate_base_asset_value_with_oracle_price;
4950
use crate::math::safe_math::SafeMath;
5051

52+
use crate::math::constants::LST_POOL_ID;
5153
use crate::math::spot_balance::get_token_value;
5254
use crate::state::events::{
5355
LiquidateBorrowForPerpPnlRecord, LiquidatePerpPnlForDepositRecord, LiquidatePerpRecord,
@@ -66,8 +68,8 @@ use crate::state::spot_market_map::SpotMarketMap;
6668
use crate::state::state::State;
6769
use crate::state::user::{MarketType, Order, OrderStatus, OrderType, User, UserStats};
6870
use crate::state::user_map::{UserMap, UserStatsMap};
69-
use crate::{get_then_update_id, load_mut, LST_POOL_ID};
70-
use crate::{validate, LIQUIDATION_FEE_PRECISION};
71+
use crate::validate;
72+
use crate::{get_then_update_id, load_mut};
7173

7274
#[cfg(test)]
7375
mod tests;

programs/drift/src/controller/orders.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::state::revenue_share::{
1010
};
1111
use anchor_lang::prelude::*;
1212

13+
use crate::controller;
1314
use crate::controller::funding::settle_funding_payment;
1415
use crate::controller::position;
1516
use crate::controller::position::{
@@ -32,7 +33,9 @@ use crate::math::amm::calculate_amm_available_liquidity;
3233
use crate::math::amm_jit::calculate_amm_jit_liquidity;
3334
use crate::math::auction::{calculate_auction_params_for_trigger_order, calculate_auction_prices};
3435
use crate::math::casting::Cast;
35-
use crate::math::constants::{BASE_PRECISION_U64, PERP_DECIMALS, QUOTE_SPOT_MARKET_INDEX};
36+
use crate::math::constants::{
37+
BASE_PRECISION_U64, MARGIN_PRECISION, PERP_DECIMALS, QUOTE_SPOT_MARKET_INDEX,
38+
};
3639
use crate::math::fees::{determine_user_fee_tier, ExternalFillFees, FillFees};
3740
use crate::math::fulfillment::{
3841
determine_perp_fulfillment_methods, determine_spot_fulfillment_methods,
@@ -81,7 +84,6 @@ use crate::validation;
8184
use crate::validation::order::{
8285
validate_order, validate_order_for_force_reduce_only, validate_spot_order,
8386
};
84-
use crate::{controller, MARGIN_PRECISION};
8587

8688
#[cfg(test)]
8789
mod tests;

programs/drift/src/controller/orders/amm_lp_jit_tests.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@ pub mod amm_lp_jit {
3333
use crate::controller::position::PositionDirection;
3434
use crate::create_account_info;
3535
use crate::create_anchor_account_info;
36-
use crate::math::constants::{
37-
PERCENTAGE_PRECISION_I128, PRICE_PRECISION_I64, QUOTE_PRECISION_I64,
38-
};
36+
use crate::math::constants::{PRICE_PRECISION_I64, QUOTE_PRECISION_I64};
3937

4038
use crate::math::amm_jit::calculate_amm_jit_liquidity;
41-
use crate::math::amm_spread::calculate_inventory_liquidity_ratio;
4239
use crate::math::constants::{
4340
AMM_RESERVE_PRECISION, BASE_PRECISION_I128, BASE_PRECISION_I64, BASE_PRECISION_U64,
4441
PEG_PRECISION, PRICE_PRECISION, SPOT_BALANCE_PRECISION_U64,
@@ -55,7 +52,6 @@ pub mod amm_lp_jit {
5552
use crate::state::user_map::{UserMap, UserStatsMap};
5653
use crate::test_utils::*;
5754
use crate::test_utils::{get_orders, get_positions, get_pyth_price, get_spot_positions};
58-
use crate::validation::perp_market::validate_perp_market;
5955

6056
use super::*;
6157

programs/drift/src/controller/position/tests.rs

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ use crate::controller::repeg::_update_amm;
66

77
use crate::math::amm::calculate_market_open_bids_asks;
88
use crate::math::constants::{
9-
AMM_RESERVE_PRECISION, AMM_RESERVE_PRECISION_I128, BASE_PRECISION, BASE_PRECISION_I64,
10-
PRICE_PRECISION_I64, PRICE_PRECISION_U64, QUOTE_PRECISION_I128,
9+
BASE_PRECISION, BASE_PRECISION_I64, PRICE_PRECISION_I64, PRICE_PRECISION_U64,
1110
SPOT_CUMULATIVE_INTEREST_PRECISION, SPOT_WEIGHT_PRECISION,
1211
};
1312
use crate::math::oracle::OracleValidity;
@@ -34,7 +33,6 @@ use crate::state::spot_market_map::SpotMarketMap;
3433
use crate::state::user::SpotPosition;
3534
use crate::test_utils::get_anchor_account_bytes;
3635
use crate::test_utils::get_hardcoded_pyth_price;
37-
use crate::QUOTE_PRECISION_I64;
3836
use anchor_lang::prelude::{AccountLoader, Clock};
3937
use anchor_lang::Owner;
4038
use solana_program::pubkey::Pubkey;
@@ -55,17 +53,7 @@ fn amm_pool_balance_liq_fees_example() {
5553
let perp_market_loader: AccountLoader<PerpMarket> =
5654
AccountLoader::try_from(&perp_market_account_info).unwrap();
5755

58-
let perp_market_map = PerpMarketMap::load_one(&perp_market_account_info, true).unwrap();
59-
6056
let now = 1725948560;
61-
let clock_slot = 326319440;
62-
let clock = Clock {
63-
unix_timestamp: now,
64-
slot: clock_slot,
65-
..Clock::default()
66-
};
67-
68-
let mut state = State::default();
6957

7058
let mut prelaunch_oracle_price = PrelaunchOracle {
7159
price: PRICE_PRECISION_I64,
@@ -79,9 +67,8 @@ fn amm_pool_balance_liq_fees_example() {
7967
prelaunch_oracle_price,
8068
&prelaunch_oracle_price_key,
8169
PrelaunchOracle,
82-
oracle_account_info
70+
_oracle_account_info
8371
);
84-
let mut oracle_map = OracleMap::load_one(&oracle_account_info, clock_slot, None).unwrap();
8572

8673
let mut spot_market = SpotMarket {
8774
cumulative_deposit_interest: 11425141382,
@@ -611,11 +598,11 @@ fn amm_ref_price_decay_tail_test() {
611598

612599
let signed_liquidity_ratio = liquidity_ratio
613600
.checked_mul(
614-
(perp_market
601+
perp_market
615602
.amm
616603
.get_protocol_owned_position()
617604
.unwrap()
618-
.signum() as i128),
605+
.signum() as i128,
619606
)
620607
.unwrap();
621608

@@ -656,7 +643,7 @@ fn amm_ref_price_decay_tail_test() {
656643
&state.oracle_guard_rails.validity,
657644
)
658645
.unwrap();
659-
let cost = _update_amm(
646+
_update_amm(
660647
&mut perp_market,
661648
&mm_oracle_price_data,
662649
&state,
@@ -689,7 +676,7 @@ fn amm_ref_price_decay_tail_test() {
689676
)
690677
.unwrap();
691678

692-
let cost = _update_amm(
679+
_update_amm(
693680
&mut perp_market,
694681
&mm_oracle_price_data,
695682
&state,
@@ -788,11 +775,11 @@ fn amm_ref_price_offset_decay_logic() {
788775

789776
let signed_liquidity_ratio = liquidity_ratio
790777
.checked_mul(
791-
(perp_market
778+
perp_market
792779
.amm
793780
.get_protocol_owned_position()
794781
.unwrap()
795-
.signum() as i128),
782+
.signum() as i128,
796783
)
797784
.unwrap();
798785

@@ -833,7 +820,7 @@ fn amm_ref_price_offset_decay_logic() {
833820
&state.oracle_guard_rails.validity,
834821
)
835822
.unwrap();
836-
let cost = _update_amm(
823+
_update_amm(
837824
&mut perp_market,
838825
&mm_oracle_price_data,
839826
&state,
@@ -873,7 +860,7 @@ fn amm_ref_price_offset_decay_logic() {
873860
)
874861
.unwrap();
875862

876-
let cost = _update_amm(
863+
_update_amm(
877864
&mut perp_market,
878865
&mm_oracle_price_data,
879866
&state,
@@ -962,11 +949,11 @@ fn amm_negative_ref_price_offset_decay_logic() {
962949

963950
let signed_liquidity_ratio = liquidity_ratio
964951
.checked_mul(
965-
(perp_market
952+
perp_market
966953
.amm
967954
.get_protocol_owned_position()
968955
.unwrap()
969-
.signum() as i128),
956+
.signum() as i128,
970957
)
971958
.unwrap();
972959

@@ -1007,7 +994,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
1007994
&state.oracle_guard_rails.validity,
1008995
)
1009996
.unwrap();
1010-
let cost = _update_amm(
997+
_update_amm(
1011998
&mut perp_market,
1012999
&mm_oracle_price_data,
10131000
&state,
@@ -1048,7 +1035,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
10481035
)
10491036
.unwrap();
10501037

1051-
let cost = _update_amm(
1038+
_update_amm(
10521039
&mut perp_market,
10531040
&mm_oracle_price_data,
10541041
&state,
@@ -1148,11 +1135,11 @@ fn amm_perp_ref_offset() {
11481135

11491136
let signed_liquidity_ratio = liquidity_ratio
11501137
.checked_mul(
1151-
(perp_market
1138+
perp_market
11521139
.amm
11531140
.get_protocol_owned_position()
11541141
.unwrap()
1155-
.signum() as i128),
1142+
.signum() as i128,
11561143
)
11571144
.unwrap();
11581145

@@ -1194,7 +1181,7 @@ fn amm_perp_ref_offset() {
11941181
&state.oracle_guard_rails.validity,
11951182
)
11961183
.unwrap();
1197-
let cost = _update_amm(
1184+
_update_amm(
11981185
&mut perp_market,
11991186
&mm_oracle_price_data,
12001187
&state,

programs/drift/src/controller/repeg/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ pub fn update_amm_test_bad_oracle() {
258258
#[test]
259259
pub fn update_amm_larg_conf_test() {
260260
let now = 1662800000 + 60;
261-
let mut slot = 81680085;
261+
let slot = 81680085;
262262

263263
let mut market = PerpMarket::default_btc_test();
264264
assert_eq!(market.amm.base_asset_amount_with_amm, -1000000000);
@@ -407,7 +407,7 @@ pub fn update_amm_larg_conf_test() {
407407
#[test]
408408
pub fn update_amm_larg_conf_w_neg_tfmd_test() {
409409
let now = 1662800000 + 60;
410-
let mut slot = 81680085;
410+
let slot = 81680085;
411411

412412
let mut market = PerpMarket::default_btc_test();
413413
market.amm.concentration_coef = 1414213;

programs/drift/src/controller/spot_balance/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ fn check_fee_collection_larger_nums() {
13851385

13861386
#[test]
13871387
fn test_multi_stage_borrow_rate_curve() {
1388-
let mut spot_market = SpotMarket {
1388+
let spot_market = SpotMarket {
13891389
market_index: 0,
13901390
oracle_source: OracleSource::QuoteAsset,
13911391
cumulative_deposit_interest: SPOT_CUMULATIVE_INTEREST_PRECISION,
@@ -1455,7 +1455,7 @@ fn test_multi_stage_borrow_rate_curve_sol() {
14551455

14561456
let spot_market_loader: AccountLoader<SpotMarket> =
14571457
AccountLoader::try_from(&sol_market_account_info).unwrap();
1458-
let mut spot_market = spot_market_loader.load_mut().unwrap();
1458+
let spot_market = spot_market_loader.load_mut().unwrap();
14591459

14601460
// Store all rates to verify monotonicity and smoothness later
14611461
let mut last_rate = 0_u128;

programs/drift/src/ids.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
use anchor_lang::prelude::Pubkey;
2-
use solana_program::pubkey;
3-
41
pub mod pyth_program {
52
use solana_program::declare_id;
63
#[cfg(feature = "mainnet-beta")]

programs/drift/src/instructions/admin.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,24 @@ use serum_dex::state::ToAlignedBytes;
99
use std::convert::{identity, TryInto};
1010
use std::mem::size_of;
1111

12+
use crate::controller;
1213
use crate::controller::token::{close_vault, initialize_immutable_owner, initialize_token_account};
1314
use crate::error::ErrorCode;
15+
use crate::get_then_update_id;
1416
use crate::ids::{admin_hot_wallet, amm_spread_adjust_wallet, mm_oracle_crank_wallet};
1517
use crate::instructions::constraints::*;
1618
use crate::instructions::optional_accounts::{load_maps, AccountMaps};
19+
use crate::load;
1720
use crate::math::casting::Cast;
1821
use crate::math::constants::{
1922
AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO, DEFAULT_LIQUIDATION_MARGIN_BUFFER_RATIO,
20-
FEE_POOL_TO_REVENUE_POOL_THRESHOLD, GOV_SPOT_MARKET_INDEX, IF_FACTOR_PRECISION,
21-
INSURANCE_A_MAX, INSURANCE_B_MAX, INSURANCE_C_MAX, INSURANCE_SPECULATIVE_MAX,
22-
LIQUIDATION_FEE_PRECISION, MAX_CONCENTRATION_COEFFICIENT, MAX_SQRT_K,
23-
MAX_UPDATE_K_PRICE_CHANGE, PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I64,
24-
QUOTE_SPOT_MARKET_INDEX, SPOT_CUMULATIVE_INTEREST_PRECISION, SPOT_IMF_PRECISION,
25-
SPOT_WEIGHT_PRECISION, THIRTEEN_DAY, TWENTY_FOUR_HOUR,
23+
EPOCH_DURATION, FEE_ADJUSTMENT_MAX, FEE_POOL_TO_REVENUE_POOL_THRESHOLD, GOV_SPOT_MARKET_INDEX,
24+
IF_FACTOR_PRECISION, INSURANCE_A_MAX, INSURANCE_B_MAX, INSURANCE_C_MAX,
25+
INSURANCE_SPECULATIVE_MAX, LIQUIDATION_FEE_PRECISION, MAX_CONCENTRATION_COEFFICIENT,
26+
MAX_SQRT_K, MAX_UPDATE_K_PRICE_CHANGE, PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I64,
27+
QUOTE_PRECISION_I64, QUOTE_SPOT_MARKET_INDEX, SPOT_BALANCE_PRECISION,
28+
SPOT_CUMULATIVE_INTEREST_PRECISION, SPOT_IMF_PRECISION, SPOT_WEIGHT_PRECISION, THIRTEEN_DAY,
29+
TWENTY_FOUR_HOUR,
2630
};
2731
use crate::math::cp_curve::get_update_k_result;
2832
use crate::math::helpers::get_proportion_u128;
@@ -32,6 +36,7 @@ use crate::math::safe_math::SafeMath;
3236
use crate::math::spot_balance::get_token_amount;
3337
use crate::math::spot_withdraw::validate_spot_market_vault_amount;
3438
use crate::math::{amm, bn};
39+
use crate::math_error;
3540
use crate::optional_accounts::get_token_mint;
3641
use crate::state::amm_cache::{AmmCache, CacheInfo, AMM_POSITIONS_CACHE};
3742
use crate::state::events::{
@@ -77,12 +82,8 @@ use crate::validation::fee_structure::validate_fee_structure;
7782
use crate::validation::margin::{validate_margin, validate_margin_weights};
7883
use crate::validation::perp_market::validate_perp_market;
7984
use crate::validation::spot_market::validate_borrow_rate;
80-
use crate::{controller, QUOTE_PRECISION_I64};
81-
use crate::{get_then_update_id, EPOCH_DURATION};
82-
use crate::{load, FEE_ADJUSTMENT_MAX};
8385
use crate::{load_mut, PTYH_PRICE_FEED_SEED_PREFIX};
8486
use crate::{math, safe_decrement, safe_increment};
85-
use crate::{math_error, SPOT_BALANCE_PRECISION};
8687

8788
use anchor_spl::token_2022::spl_token_2022::extension::transfer_hook::TransferHook;
8889
use anchor_spl::token_2022::spl_token_2022::extension::{

programs/drift/src/instructions/if_staker.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use crate::error::ErrorCode;
66
use crate::ids::{admin_hot_wallet, if_rebalance_wallet};
77
use crate::instructions::constraints::*;
88
use crate::instructions::optional_accounts::{load_maps, AccountMaps};
9+
use crate::load_mut;
10+
use crate::math::constants::QUOTE_SPOT_MARKET_INDEX;
911
use crate::optional_accounts::get_token_mint;
1012
use crate::state::insurance_fund_stake::{InsuranceFundStake, ProtocolIfSharesTransferConfig};
1113
use crate::state::paused_operations::InsuranceFundOperation;
@@ -23,7 +25,6 @@ use crate::{
2325
spot_market_map::get_writable_spot_market_set_from_many,
2426
},
2527
};
26-
use crate::{load_mut, QUOTE_SPOT_MARKET_INDEX};
2728
use anchor_lang::solana_program::sysvar::instructions;
2829

2930
use super::optional_accounts::get_token_interface;

0 commit comments

Comments
 (0)