Comment fixes, linting

mrgnlabs · Aug 12, 2024 · 8a34628 · 8a34628
1 parent fca412e
commit 8a34628
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/programs/marginfi/src/state/marginfi_account.rs b/programs/marginfi/src/state/marginfi_account.rs
@@ -490,12 +490,6 @@ impl<'info> RiskEngine<'_, 'info> {
                 a.balance.bank_pk, assets, liabilities
             );
 
-            // TODO remove
-            msg!(
-                "BALS Balance {}, assets: {}, liabilities: {}",
-                a.balance.bank_pk, assets, liabilities
-            );
-
             total_assets = total_assets.checked_add(assets).ok_or_else(math_error!())?;
             total_liabilities = total_liabilities
                 .checked_add(liabilities)

diff --git a/programs/marginfi/src/state/price.rs b/programs/marginfi/src/state/price.rs
@@ -329,7 +329,7 @@ impl SwitchboardPullPriceFeed {
 
         // Check staleness
         let last_updated = feed.last_update_timestamp;
-        if current_timestamp - last_updated > max_age as i64 {
+        if current_timestamp.saturating_sub(last_updated) > max_age as i64 {
             return err!(MarginfiError::StaleOracle);
         }
 
@@ -354,7 +354,7 @@ impl SwitchboardPullPriceFeed {
     fn get_price(&self) -> MarginfiResult<I80F48> {
         let sw_result = self.feed.result;
         // Note: Pull oracles support mean (result.mean) or median (result.value)
-        let price: I80F48 = I80F48::from_num(sw_result.value)
+        let price: I80F48 = I80F48::from_num(sw_result.mean)
             .checked_div(EXP_10_I80F48[switchboard_on_demand::PRECISION as usize])
             .ok_or_else(math_error!())?;
 

diff --git a/programs/marginfi/src/utils.rs b/programs/marginfi/src/utils.rs
@@ -191,4 +191,4 @@ pub fn hex_to_bytes(hex: &str) -> Vec<u8> {
             (high << 4) | low
         })
         .collect()
-}
+}
diff --git a/test-utils/src/test.rs b/test-utils/src/test.rs
@@ -607,7 +607,9 @@ impl TestFixture {
                     BankMint::UsdcSwb => (&usdc_mint_f, *DEFAULT_USDC_TEST_SW_BANK_CONFIG),
                     BankMint::Sol => (&sol_mint_f, *DEFAULT_SOL_TEST_BANK_CONFIG),
                     BankMint::SolSwb => (&sol_mint_f, *DEFAULT_SOL_TEST_SW_BANK_CONFIG),
-                    BankMint::SolSwbPull => (&sol_mint_f, *DEFAULT_SB_PULL_SOL_TEST_REAL_BANK_CONFIG),
+                    BankMint::SolSwbPull => {
+                        (&sol_mint_f, *DEFAULT_SB_PULL_SOL_TEST_REAL_BANK_CONFIG)
+                    }
                     BankMint::SolEquivalent => (
                         &sol_equivalent_mint_f,
                         *DEFAULT_SOL_EQUIVALENT_TEST_BANK_CONFIG,

diff --git a/test-utils/src/utils.rs b/test-utils/src/utils.rs
@@ -709,4 +709,4 @@ pub mod lip {
             &liquidity_incentive_program::id(),
         )
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,4 +191,4 @@ pub fn hex_to_bytes(hex: &str) -> Vec<u8> { @@
                 (high << 4) | low
             })
             .collect()
-    }
+    }