Skip to content

Commit da2bd97

Browse files
authored
consolidate some admin funcs (#2014)
* comment out funcs to make room for ix count * comment out tests from anchor tests script * update admin test * update idl and anchor tests pass
1 parent 1785353 commit da2bd97

File tree

6 files changed

+72
-321
lines changed

6 files changed

+72
-321
lines changed

programs/drift/src/instructions/admin.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3579,20 +3579,6 @@ pub fn handle_update_perp_market_reference_price_offset_deadband_pct(
35793579
Ok(())
35803580
}
35813581

3582-
pub fn handle_update_lp_cooldown_time(
3583-
ctx: Context<AdminUpdateState>,
3584-
lp_cooldown_time: u64,
3585-
) -> Result<()> {
3586-
msg!(
3587-
"lp_cooldown_time: {} -> {}",
3588-
ctx.accounts.state.lp_cooldown_time,
3589-
lp_cooldown_time
3590-
);
3591-
3592-
ctx.accounts.state.lp_cooldown_time = lp_cooldown_time;
3593-
Ok(())
3594-
}
3595-
35963582
pub fn handle_update_perp_fee_structure(
35973583
ctx: Context<AdminUpdateState>,
35983584
fee_structure: FeeStructure,

programs/drift/src/lib.rs

Lines changed: 53 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -512,11 +512,11 @@ pub mod drift {
512512
handle_disable_user_high_leverage_mode(ctx, disable_maintenance)
513513
}
514514

515-
pub fn update_user_fuel_bonus<'c: 'info, 'info>(
516-
ctx: Context<'_, '_, 'c, 'info, UpdateUserFuelBonus<'info>>,
517-
) -> Result<()> {
518-
handle_update_user_fuel_bonus(ctx)
519-
}
515+
// pub fn update_user_fuel_bonus<'c: 'info, 'info>(
516+
// ctx: Context<'_, '_, 'c, 'info, UpdateUserFuelBonus<'info>>,
517+
// ) -> Result<()> {
518+
// handle_update_user_fuel_bonus(ctx)
519+
// }
520520

521521
pub fn update_user_stats_referrer_status<'c: 'info, 'info>(
522522
ctx: Context<'_, '_, 'c, 'info, UpdateUserStatsReferrerInfo<'info>>,
@@ -1455,13 +1455,6 @@ pub mod drift {
14551455
)
14561456
}
14571457

1458-
pub fn update_lp_cooldown_time(
1459-
ctx: Context<AdminUpdateState>,
1460-
lp_cooldown_time: u64,
1461-
) -> Result<()> {
1462-
handle_update_lp_cooldown_time(ctx, lp_cooldown_time)
1463-
}
1464-
14651458
pub fn update_perp_fee_structure(
14661459
ctx: Context<AdminUpdateState>,
14671460
fee_structure: FeeStructure,
@@ -1620,14 +1613,14 @@ pub mod drift {
16201613
handle_update_spot_market_fee_adjustment(ctx, fee_adjustment)
16211614
}
16221615

1623-
pub fn update_perp_market_fuel(
1624-
ctx: Context<HotAdminUpdatePerpMarket>,
1625-
fuel_boost_taker: Option<u8>,
1626-
fuel_boost_maker: Option<u8>,
1627-
fuel_boost_position: Option<u8>,
1628-
) -> Result<()> {
1629-
handle_update_perp_market_fuel(ctx, fuel_boost_taker, fuel_boost_maker, fuel_boost_position)
1630-
}
1616+
// pub fn update_perp_market_fuel(
1617+
// ctx: Context<HotAdminUpdatePerpMarket>,
1618+
// fuel_boost_taker: Option<u8>,
1619+
// fuel_boost_maker: Option<u8>,
1620+
// fuel_boost_position: Option<u8>,
1621+
// ) -> Result<()> {
1622+
// handle_update_perp_market_fuel(ctx, fuel_boost_taker, fuel_boost_maker, fuel_boost_position)
1623+
// }
16311624

16321625
pub fn update_perp_market_protected_maker_params(
16331626
ctx: Context<AdminUpdatePerpMarket>,
@@ -1672,52 +1665,52 @@ pub mod drift {
16721665
handle_update_perp_market_oracle_slot_delay_override(ctx, oracle_slot_delay_override)
16731666
}
16741667

1675-
pub fn update_spot_market_fuel(
1676-
ctx: Context<AdminUpdateSpotMarketFuel>,
1677-
fuel_boost_deposits: Option<u8>,
1678-
fuel_boost_borrows: Option<u8>,
1679-
fuel_boost_taker: Option<u8>,
1680-
fuel_boost_maker: Option<u8>,
1681-
fuel_boost_insurance: Option<u8>,
1682-
) -> Result<()> {
1683-
handle_update_spot_market_fuel(
1684-
ctx,
1685-
fuel_boost_deposits,
1686-
fuel_boost_borrows,
1687-
fuel_boost_taker,
1688-
fuel_boost_maker,
1689-
fuel_boost_insurance,
1690-
)
1691-
}
1668+
// pub fn update_spot_market_fuel(
1669+
// ctx: Context<AdminUpdateSpotMarketFuel>,
1670+
// fuel_boost_deposits: Option<u8>,
1671+
// fuel_boost_borrows: Option<u8>,
1672+
// fuel_boost_taker: Option<u8>,
1673+
// fuel_boost_maker: Option<u8>,
1674+
// fuel_boost_insurance: Option<u8>,
1675+
// ) -> Result<()> {
1676+
// handle_update_spot_market_fuel(
1677+
// ctx,
1678+
// fuel_boost_deposits,
1679+
// fuel_boost_borrows,
1680+
// fuel_boost_taker,
1681+
// fuel_boost_maker,
1682+
// fuel_boost_insurance,
1683+
// )
1684+
// }
16921685

1693-
pub fn init_user_fuel(
1694-
ctx: Context<InitUserFuel>,
1695-
fuel_boost_deposits: Option<i32>,
1696-
fuel_boost_borrows: Option<u32>,
1697-
fuel_boost_taker: Option<u32>,
1698-
fuel_boost_maker: Option<u32>,
1699-
fuel_boost_insurance: Option<u32>,
1700-
) -> Result<()> {
1701-
handle_init_user_fuel(
1702-
ctx,
1703-
fuel_boost_deposits,
1704-
fuel_boost_borrows,
1705-
fuel_boost_taker,
1706-
fuel_boost_maker,
1707-
fuel_boost_insurance,
1708-
)
1709-
}
1686+
// pub fn init_user_fuel(
1687+
// ctx: Context<InitUserFuel>,
1688+
// fuel_boost_deposits: Option<i32>,
1689+
// fuel_boost_borrows: Option<u32>,
1690+
// fuel_boost_taker: Option<u32>,
1691+
// fuel_boost_maker: Option<u32>,
1692+
// fuel_boost_insurance: Option<u32>,
1693+
// ) -> Result<()> {
1694+
// handle_init_user_fuel(
1695+
// ctx,
1696+
// fuel_boost_deposits,
1697+
// fuel_boost_borrows,
1698+
// fuel_boost_taker,
1699+
// fuel_boost_maker,
1700+
// fuel_boost_insurance,
1701+
// )
1702+
// }
17101703

17111704
pub fn update_admin(ctx: Context<AdminUpdateState>, admin: Pubkey) -> Result<()> {
17121705
handle_update_admin(ctx, admin)
17131706
}
17141707

1715-
pub fn update_whitelist_mint(
1716-
ctx: Context<AdminUpdateState>,
1717-
whitelist_mint: Pubkey,
1718-
) -> Result<()> {
1719-
handle_update_whitelist_mint(ctx, whitelist_mint)
1720-
}
1708+
// pub fn update_whitelist_mint(
1709+
// ctx: Context<AdminUpdateState>,
1710+
// whitelist_mint: Pubkey,
1711+
// ) -> Result<()> {
1712+
// handle_update_whitelist_mint(ctx, whitelist_mint)
1713+
// }
17211714

17221715
pub fn update_discount_mint(
17231716
ctx: Context<AdminUpdateState>,

0 commit comments

Comments
 (0)