chore: cargo fmt

Author: 0xfave

src/oracle.rs

@@ -108,7 +108,7 @@ pub fn validate_pyth_price(
     }
 
     // --- Read the number of component publishers ---
-    // In pyth_sdk_solana::state, `num` is at offset 20 (after 
+    // In pyth_sdk_solana::state, `num` is at offset 20 (after
     // magic(4), ver(4), type(4), size(4), expo(4) = 20).
     let num = u32::from_le_bytes(data[20..24].try_into().ok()?) as usize;
 
@@ -131,21 +131,9 @@ pub fn validate_pyth_price(
     //   [16..20): status    (i32)
     //   [20..24): corp_act  (i32)
     //   [24..32): pub_slot  (i64)
-    let price_raw = i64::from_le_bytes(
-        data[agg_offset..agg_offset + 8]
-            .try_into()
-            .ok()?,
-    );
-    let confidence = u64::from_le_bytes(
-        data[agg_offset + 8..agg_offset + 16]
-            .try_into()
-            .ok()?,
-    );
-    let publish_time = i64::from_le_bytes(
-        data[agg_offset + 24..agg_offset + 32]
-            .try_into()
-            .ok()?,
-    );
+    let price_raw = i64::from_le_bytes(data[agg_offset..agg_offset + 8].try_into().ok()?);
+    let confidence = u64::from_le_bytes(data[agg_offset + 8..agg_offset + 16].try_into().ok()?);
+    let publish_time = i64::from_le_bytes(data[agg_offset + 24..agg_offset + 32].try_into().ok()?);
 
     // --- Read exponent from the header (offset 16 in pyth-sdk-solana) ---
     let exponent = i32::from_le_bytes(data[16..20].try_into().ok()?);
@@ -220,9 +208,7 @@ pub fn normalize_price(raw_price: u64, exponent: i32) -> u64 {
             .unwrap_or(u64::MAX);
         raw_price.checked_div(divisor).unwrap_or(0)
     } else {
-        let multiplier = 10u64
-            .checked_pow(exponent as u32)
-            .unwrap_or(u64::MAX);
+        let multiplier = 10u64.checked_pow(exponent as u32).unwrap_or(u64::MAX);
         raw_price.saturating_mul(multiplier)
     }
 }
@@ -245,11 +231,11 @@ mod tests {
         let mut data = vec![0u8; total_size];
 
         // Header
-        data[0..4].copy_from_slice(&PYTH_MAGIC.to_le_bytes());   // magic
-        data[4..8].copy_from_slice(&2u32.to_le_bytes());          // ver
-        data[8] = PYTH_ACCOUNT_TYPE_PRICE;                        // type
+        data[0..4].copy_from_slice(&PYTH_MAGIC.to_le_bytes()); // magic
+        data[4..8].copy_from_slice(&2u32.to_le_bytes()); // ver
+        data[8] = PYTH_ACCOUNT_TYPE_PRICE; // type
         data[12..16].copy_from_slice(&(total_size as u32).to_le_bytes()); // size
-        data[16..20].copy_from_slice(&exponent.to_le_bytes());    // expo
+        data[16..20].copy_from_slice(&exponent.to_le_bytes()); // expo
         data[20..24].copy_from_slice(&num_publishers.to_le_bytes()); // num
 
         // Aggregate PriceInfo starts after header + comp array
@@ -286,16 +272,9 @@ mod tests {
         }
 
         let price_raw = i64::from_le_bytes(data[agg_offset..agg_offset + 8].try_into().ok()?);
-        let confidence = u64::from_le_bytes(
-            data[agg_offset + 8..agg_offset + 16]
-                .try_into()
-                .ok()?,
-        );
-        let publish_time = i64::from_le_bytes(
-            data[agg_offset + 24..agg_offset + 32]
-                .try_into()
-                .ok()?,
-        );
+        let confidence = u64::from_le_bytes(data[agg_offset + 8..agg_offset + 16].try_into().ok()?);
+        let publish_time =
+            i64::from_le_bytes(data[agg_offset + 24..agg_offset + 32].try_into().ok()?);
         let exponent = i32::from_le_bytes(data[16..20].try_into().ok()?);
 
         let price_abs = price_raw.unsigned_abs();
@@ -326,7 +305,7 @@ mod tests {
         }
 
         let age = clock_ts.checked_sub(publish_time).unwrap_or(i64::MAX);
-    if !(0..=MAX_STALENESS_SECS).contains(&age) {
+        if !(0..=MAX_STALENESS_SECS).contains(&age) {
             return Some(OraclePriceData {
                 price: price_abs,
                 exponent,

src/processor.rs

@@ -1419,10 +1419,7 @@ pub fn match_orders(
     // fill price. Otherwise fall back to the CLOB limit price.
     let clock = Clock::get()?;
     let fill_price = if let Some(oracle_acct) = ctx.oracle_price {
-        let oracle_data = crate::oracle::validate_pyth_price(
-            oracle_acct,
-            clock.unix_timestamp,
-        );
+        let oracle_data = crate::oracle::validate_pyth_price(oracle_acct, clock.unix_timestamp);
         match oracle_data {
             Some(od) if od.is_valid => {
                 // If PMM is configured, compute the PMM effective price using
@@ -1462,7 +1459,8 @@ pub fn match_orders(
                             .checked_mul(1_000_000)
                             .ok_or(FluxDexError::ArithmeticOverflow)?
                             .checked_div(m_pmm_base_eq as i128)
-                            .ok_or(FluxDexError::ArithmeticOverflow)? as i64)
+                            .ok_or(FluxDexError::ArithmeticOverflow)?
+                            as i64)
                     };
 
                     // Clamp skew to [-1_000_000, 1_000_000]

tests/flux_dex_tests.rs

@@ -2547,8 +2547,15 @@ fn match_orders_ix(
     seller_order: &Pubkey,
 ) -> Instruction {
     match_orders_ix_with_oracle(
-        crank, crank_signer, market, orderbook, base_vault, quote_vault,
-        buyer_order, seller_order, None,
+        crank,
+        crank_signer,
+        market,
+        orderbook,
+        base_vault,
+        quote_vault,
+        buyer_order,
+        seller_order,
+        None,
     )
 }
 
@@ -4210,10 +4217,8 @@ fn two_traders_delegate_undelegate_match_settle() {
 
 /// Pyth oracle program ID on mainnet (just for owner field in test).
 const PYTH_ORACLE_ID: Pubkey = Pubkey::new_from_array([
-    0x6d, 0xe2, 0x39, 0xa5, 0xa2, 0xb4, 0xc7, 0x43,
-    0x62, 0x09, 0xf5, 0xa5, 0x0c, 0x35, 0x2b, 0x98,
-    0x51, 0xdb, 0xe0, 0x4e, 0xae, 0x13, 0x8a, 0xd3,
-    0x11, 0xf8, 0x9e, 0x28, 0x85, 0xaf, 0x11, 0x00,
+    0x6d, 0xe2, 0x39, 0xa5, 0xa2, 0xb4, 0xc7, 0x43, 0x62, 0x09, 0xf5, 0xa5, 0x0c, 0x35, 0x2b, 0x98,
+    0x51, 0xdb, 0xe0, 0x4e, 0xae, 0x13, 0x8a, 0xd3, 0x11, 0xf8, 0x9e, 0x28, 0x85, 0xaf, 0x11, 0x00,
 ]);
 
 /// Create a mock Pyth V2 price account and set it into the SVM.
@@ -4226,16 +4231,18 @@ fn setup_pyth_oracle(
     exponent: i32,
     num_publishers: u32,
 ) {
-    use flux_dex::oracle::{COMP_SIZE, HEADER_SIZE, PRICE_INFO_SIZE, PYTH_ACCOUNT_TYPE_PRICE, PYTH_MAGIC};
+    use flux_dex::oracle::{
+        COMP_SIZE, HEADER_SIZE, PRICE_INFO_SIZE, PYTH_ACCOUNT_TYPE_PRICE, PYTH_MAGIC,
+    };
 
     let comp_array_size = num_publishers as usize * COMP_SIZE;
     let total_size = HEADER_SIZE + comp_array_size + PRICE_INFO_SIZE;
     let mut data = vec![0u8; total_size];
 
     // Header
     data[0..4].copy_from_slice(&PYTH_MAGIC.to_le_bytes());
-    data[4..8].copy_from_slice(&2u32.to_le_bytes());          // version
-    data[8] = PYTH_ACCOUNT_TYPE_PRICE;                        // type
+    data[4..8].copy_from_slice(&2u32.to_le_bytes()); // version
+    data[8] = PYTH_ACCOUNT_TYPE_PRICE; // type
     data[12..16].copy_from_slice(&(total_size as u32).to_le_bytes());
     data[16..20].copy_from_slice(&exponent.to_le_bytes());
     data[20..24].copy_from_slice(&num_publishers.to_le_bytes());
@@ -4251,10 +4258,13 @@ fn setup_pyth_oracle(
     // Insert into SVM
     svm.airdrop(oracle_addr, 1_000_000_000)
         .expect("airdrop for oracle account");
-    let mut account = svm.get_account(oracle_addr).expect("oracle account after airdrop");
+    let mut account = svm
+        .get_account(oracle_addr)
+        .expect("oracle account after airdrop");
     account.data = data;
     account.owner = PYTH_ORACLE_ID;
-    svm.set_account(*oracle_addr, account).expect("set pyth oracle account");
+    svm.set_account(*oracle_addr, account)
+        .expect("set pyth oracle account");
 }
 
 /// match_orders with a valid Pyth oracle price account.
@@ -4296,7 +4306,10 @@ fn match_orders_with_pyth_oracle() {
         Some(&px),
     );
     let cu = send_tx(&mut fix.svm, &[ix], &fix.payer.pubkey(), &[&fix.payer]);
-    assert!(cu < 40_000, "match_orders with oracle CU {cu} exceeded 40k limit");
+    assert!(
+        cu < 40_000,
+        "match_orders with oracle CU {cu} exceeded 40k limit"
+    );
 
     // Verify both orders filled.
     let b_acc = fix.svm.get_account(&b_order).expect("buyer order account");
@@ -4311,7 +4324,11 @@ fn match_orders_with_pyth_oracle() {
     // The raw Pyth price (100_000_000) is stored; frontend normalizes via exponent.
     let mkt_acc = fix.svm.get_account(&fix.market).expect("market account");
     let mkt = Market::from_account(&mkt_acc.data).expect("decode market");
-    assert_eq!(mkt.oracle_price(), 100_000_000, "oracle price raw (exp -6 => 100 human)");
+    assert_eq!(
+        mkt.oracle_price(),
+        100_000_000,
+        "oracle price raw (exp -6 => 100 human)"
+    );
     assert_eq!(mkt.oracle_timestamp(), now, "oracle timestamp cached");
 }
 
@@ -4357,7 +4374,11 @@ fn match_orders_with_stale_oracle_still_succeeds() {
     // Verify orders filled.
     let b_acc = fix.svm.get_account(&b_order).expect("buyer order account");
     let b = Order::from_account(&b_acc.data).expect("decode buyer order");
-    assert_eq!(b.status().unwrap(), OrderStatus::Filled, "buyer filled despite stale oracle");
+    assert_eq!(
+        b.status().unwrap(),
+        OrderStatus::Filled,
+        "buyer filled despite stale oracle"
+    );
 }
 
 /// match_orders without oracle (back-compat): 7-account layout still works.
@@ -4383,11 +4404,18 @@ fn match_orders_without_oracle_back_compat() {
         &s_order,
     );
     let cu = send_tx(&mut fix.svm, &[ix], &fix.payer.pubkey(), &[&fix.payer]);
-    assert!(cu < 30_000, "match_orders w/o oracle CU {cu} exceeded 30k limit");
+    assert!(
+        cu < 30_000,
+        "match_orders w/o oracle CU {cu} exceeded 30k limit"
+    );
 
     let b_acc = fix.svm.get_account(&b_order).expect("buyer order account");
     let b = Order::from_account(&b_acc.data).expect("decode buyer order");
-    assert_eq!(b.status().unwrap(), OrderStatus::Filled, "buyer filled without oracle");
+    assert_eq!(
+        b.status().unwrap(),
+        OrderStatus::Filled,
+        "buyer filled without oracle"
+    );
 }
 
 // ============================================================================