Skip to content

Commit b00767a

Browse files
authored
fix cargo fmt (#2113)
1 parent 1614821 commit b00767a

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

programs/drift/src/controller/orders.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,10 @@ pub fn fill_perp_order(
13691369
)?
13701370
}
13711371

1372-
if base_asset_amount_after == 0 && user.perp_positions[position_index].open_asks == 0 && user.perp_positions[position_index].open_bids == 0 {
1372+
if base_asset_amount_after == 0
1373+
&& user.perp_positions[position_index].open_asks == 0
1374+
&& user.perp_positions[position_index].open_bids == 0
1375+
{
13731376
cancel_reduce_only_trigger_orders(
13741377
user,
13751378
&user_key,

programs/drift/src/instructions/user.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ use crate::state::order_params::{
8181
PlaceOrderOptions, PostOnlyParam,
8282
};
8383
use crate::state::paused_operations::{PerpOperation, SpotOperation};
84-
use crate::state::scale_order_params::ScaleOrderParams;
8584
use crate::state::perp_market::MarketStatus;
8685
use crate::state::perp_market_map::{get_writable_perp_market_set, MarketSet};
8786
use crate::state::protected_maker_mode_config::ProtectedMakerModeConfig;
@@ -91,6 +90,7 @@ use crate::state::revenue_share::RevenueShareEscrow;
9190
use crate::state::revenue_share::RevenueShareOrder;
9291
use crate::state::revenue_share::REVENUE_SHARE_ESCROW_PDA_SEED;
9392
use crate::state::revenue_share::REVENUE_SHARE_PDA_SEED;
93+
use crate::state::scale_order_params::ScaleOrderParams;
9494
use crate::state::signed_msg_user::SignedMsgOrderId;
9595
use crate::state::signed_msg_user::SignedMsgUserOrdersLoader;
9696
use crate::state::signed_msg_user::SignedMsgWsDelegates;
@@ -2666,7 +2666,8 @@ fn place_orders<'c: 'info, 'info>(
26662666
}
26672667
};
26682668

2669-
scale_params.expand_to_order_params(order_step_size)
2669+
scale_params
2670+
.expand_to_order_params(order_step_size)
26702671
.map_err(|e| {
26712672
msg!("Failed to expand scale order params: {:?}", e);
26722673
ErrorCode::InvalidOrder

programs/drift/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ use crate::controller::position::PositionDirection;
1313
use crate::state::if_rebalance_config::IfRebalanceConfigParams;
1414
use crate::state::oracle::PrelaunchOracleParams;
1515
use crate::state::order_params::{ModifyOrderParams, OrderParams};
16-
use crate::state::scale_order_params::ScaleOrderParams;
1716
use crate::state::perp_market::{ContractTier, MarketStatus};
17+
use crate::state::scale_order_params::ScaleOrderParams;
1818
use crate::state::settle_pnl_mode::SettlePnlMode;
1919
use crate::state::spot_market::AssetTier;
2020
use crate::state::spot_market::SpotFulfillmentConfigStatus;

programs/drift/src/state/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ pub mod oracle;
1515
pub mod oracle_map;
1616
pub mod order_params;
1717
pub mod paused_operations;
18-
pub mod scale_order_params;
1918
pub mod perp_market;
2019
pub mod perp_market_map;
2120
pub mod protected_maker_mode_config;
2221
pub mod pyth_lazer_oracle;
2322
pub mod revenue_share;
2423
pub mod revenue_share_map;
24+
pub mod scale_order_params;
2525
pub mod settle_pnl_mode;
2626
pub mod signed_msg_user;
2727
pub mod spot_fulfillment_params;

programs/drift/src/state/order_params.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,4 +1027,3 @@ pub fn parse_optional_params(optional_params: Option<u32>) -> (u8, u8) {
10271027
None => (0, 100),
10281028
}
10291029
}
1030-

programs/drift/src/state/scale_order_params/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ fn test_expand_to_order_params_spot() {
442442
let params = ScaleOrderParams {
443443
market_type: MarketType::Spot,
444444
direction: PositionDirection::Long,
445-
market_index: 1, // SOL spot market
445+
market_index: 1, // SOL spot market
446446
total_base_asset_amount: BASE_PRECISION_U64, // 1.0
447447
start_price: 110 * PRICE_PRECISION_U64,
448448
end_price: 100 * PRICE_PRECISION_U64,
@@ -482,7 +482,7 @@ fn test_spot_short_scale_orders() {
482482
let params = ScaleOrderParams {
483483
market_type: MarketType::Spot,
484484
direction: PositionDirection::Short,
485-
market_index: 1, // SOL spot market
485+
market_index: 1, // SOL spot market
486486
total_base_asset_amount: BASE_PRECISION_U64, // 1.0
487487
start_price: 100 * PRICE_PRECISION_U64,
488488
end_price: 110 * PRICE_PRECISION_U64,

0 commit comments

Comments
 (0)