clippy

solendprotocol · Dec 15, 2023 · 68d64e0 · 68d64e0
1 parent f2db807
commit 68d64e0
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 17 deletions.
diff --git a/token-lending/cli/src/lending_state.rs b/token-lending/cli/src/lending_state.rs
@@ -75,7 +75,7 @@ impl SolendState {
                 *pubkey,
                 reserve.liquidity.pyth_oracle_pubkey,
                 reserve.liquidity.switchboard_oracle_pubkey,
-                reserve.config.extra_oracle_pubkey
+                reserve.config.extra_oracle_pubkey,
             )
         }));
 

diff --git a/token-lending/cli/src/main.rs b/token-lending/cli/src/main.rs
@@ -1546,7 +1546,7 @@ fn command_liquidate_obligation(
             *pubkey,
             reserve.liquidity.pyth_oracle_pubkey,
             reserve.liquidity.switchboard_oracle_pubkey,
-            reserve.config.extra_oracle_pubkey
+            reserve.config.extra_oracle_pubkey,
         )
     }));
 

diff --git a/token-lending/program/tests/helpers/mock_pyth.rs b/token-lending/program/tests/helpers/mock_pyth.rs
@@ -34,7 +34,7 @@ pub enum MockPythInstruction {
         expo: i32,
         ema_price: i64,
         ema_conf: u64,
-    }
+    },
 }
 
 pub fn process_instruction(

diff --git a/token-lending/program/tests/helpers/mock_switchboard.rs b/token-lending/program/tests/helpers/mock_switchboard.rs
@@ -114,7 +114,9 @@ pub fn set_switchboard_price(
 }
 
 pub fn init_switchboard(program_id: Pubkey, switchboard_feed: Pubkey) -> Instruction {
-    let data = MockSwitchboardInstruction::InitSwitchboard.try_to_vec().unwrap();
+    let data = MockSwitchboardInstruction::InitSwitchboard
+        .try_to_vec()
+        .unwrap();
     Instruction {
         program_id,
         accounts: vec![AccountMeta::new(switchboard_feed, false)],

diff --git a/token-lending/program/tests/helpers/solend_program_test.rs b/token-lending/program/tests/helpers/solend_program_test.rs
@@ -414,9 +414,7 @@ impl SolendProgramTest {
     }
 
     pub async fn init_pyth_feed(&mut self, mint: &Pubkey) -> Pubkey {
-        let pyth_price_pubkey = self
-            .create_account(3312, &pyth_mainnet::id(), None)
-            .await;
+        let pyth_price_pubkey = self.create_account(3312, &pyth_mainnet::id(), None).await;
         let pyth_product_pubkey = self
             .create_account(PROD_ACCT_SIZE, &pyth_mainnet::id(), None)
             .await;
@@ -807,7 +805,7 @@ impl Info<LendingMarket> {
                 reserve.pubkey,
                 reserve.account.liquidity.pyth_oracle_pubkey,
                 reserve.account.liquidity.switchboard_oracle_pubkey,
-                reserve.account.config.extra_oracle_pubkey
+                reserve.account.config.extra_oracle_pubkey,
             ),
             redeem_reserve_collateral(
                 solend_program::id(),
@@ -903,7 +901,7 @@ impl Info<LendingMarket> {
                     reserve.pubkey,
                     reserve.account.liquidity.pyth_oracle_pubkey,
                     reserve.account.liquidity.switchboard_oracle_pubkey,
-                    reserve.account.config.extra_oracle_pubkey
+                    reserve.account.config.extra_oracle_pubkey,
                 ),
             ],
             None,
@@ -949,7 +947,7 @@ impl Info<LendingMarket> {
                     reserve.pubkey,
                     reserve.account.liquidity.pyth_oracle_pubkey,
                     reserve.account.liquidity.switchboard_oracle_pubkey,
-                    reserve.account.config.extra_oracle_pubkey
+                    reserve.account.config.extra_oracle_pubkey,
                 )
             })
             .collect();
@@ -1076,7 +1074,7 @@ impl Info<LendingMarket> {
                 reserve.pubkey,
                 reserve.account.liquidity.pyth_oracle_pubkey,
                 reserve.account.liquidity.switchboard_oracle_pubkey,
-                reserve.account.config.extra_oracle_pubkey
+                reserve.account.config.extra_oracle_pubkey,
             ),
             redeem_fees(
                 solend_program::id(),

diff --git a/token-lending/program/tests/init_reserve.rs b/token-lending/program/tests/init_reserve.rs
@@ -1,7 +1,7 @@
 #![cfg(feature = "test-bpf")]
 
 use crate::solend_program_test::PriceArgs;
-use crate::solend_program_test::custom_scenario;
+
 use crate::solend_program_test::BalanceChecker;
 use crate::solend_program_test::MintAccount;
 use crate::solend_program_test::MintSupplyChange;

diff --git a/token-lending/program/tests/refresh_reserve.rs b/token-lending/program/tests/refresh_reserve.rs
@@ -445,7 +445,7 @@ async fn test_use_price_weight() {
 
 #[tokio::test]
 async fn test_use_extra_oracle() {
-    let (mut test, lending_market, reserves, obligations, users, lending_market_owner) =
+    let (mut test, lending_market, reserves, _obligations, _users, lending_market_owner) =
         custom_scenario(
             &[ReserveArgs {
                 mint: msol_mint::id(),
@@ -610,7 +610,7 @@ async fn test_use_extra_oracle() {
 
 #[tokio::test]
 async fn test_use_extra_oracle_bad_cases() {
-    let (mut test, lending_market, reserves, obligations, users, lending_market_owner) =
+    let (mut test, lending_market, reserves, _obligations, _users, lending_market_owner) =
         custom_scenario(
             &[ReserveArgs {
                 mint: msol_mint::id(),

diff --git a/token-lending/program/tests/update_reserve_config.rs b/token-lending/program/tests/update_reserve_config.rs
@@ -417,7 +417,7 @@ pub fn malicious_update_reserve_config(
 
 #[tokio::test]
 async fn test_add_extra_oracle() {
-    let (mut test, lending_market, reserves, obligations, users, lending_market_owner) =
+    let (mut test, lending_market, reserves, _obligations, _users, lending_market_owner) =
         custom_scenario(
             &[ReserveArgs {
                 mint: msol_mint::id(),

diff --git a/token-lending/sdk/src/oracles.rs b/token-lending/sdk/src/oracles.rs
@@ -26,7 +26,11 @@ pub fn get_oracle_type(extra_oracle_info: &AccountInfo) -> Result<OracleType, Pr
         return Ok(OracleType::Switchboard);
     }
 
-    msg!("Could not find oracle type for {:?} with owner {:?}", extra_oracle_info.key, extra_oracle_info.owner);
+    msg!(
+        "Could not find oracle type for {:?} with owner {:?}",
+        extra_oracle_info.key,
+        extra_oracle_info.owner
+    );
     Err(LendingError::InvalidOracleConfig.into())
 }
 

diff --git a/token-lending/sdk/src/state/reserve.rs b/token-lending/sdk/src/state/reserve.rs
@@ -2760,7 +2760,6 @@ mod test {
 
                 result: Err(LendingError::BorrowTooLarge.into()),
             }),
-
             // borrow enough where it would be fine if we were just using the market + ema price but
             // not fine when using market + ema + extra price
             Just(CalculateBorrowTestCase {