minor cleanup

token-lending/oracles/src/lib.rs

@@ -1,8 +1,12 @@
 pub mod pyth;
 pub mod switchboard;
 
+use crate::pyth::get_pyth_price_unchecked;
 use crate::pyth::get_pyth_pull_price;
+use crate::pyth::get_pyth_pull_price_unchecked;
 use crate::switchboard::get_switchboard_price;
+use crate::switchboard::get_switchboard_price_on_demand;
+use crate::switchboard::get_switchboard_price_v2;
 use solana_program::{
     account_info::AccountInfo, msg, program_error::ProgramError, sysvar::clock::Clock,
 };
@@ -59,6 +63,18 @@ pub fn get_single_price(
     }
 }
 
+pub fn get_single_price_unchecked(
+    oracle_account_info: &AccountInfo,
+    clock: &Clock,
+) -> Result<Decimal, ProgramError> {
+    match get_oracle_type(oracle_account_info)? {
+        OracleType::Pyth => get_pyth_price_unchecked(oracle_account_info),
+        OracleType::PythPull => get_pyth_pull_price_unchecked(oracle_account_info),
+        OracleType::Switchboard => get_switchboard_price_v2(oracle_account_info, clock, false),
+        OracleType::SbOnDemand => get_switchboard_price_on_demand(oracle_account_info, clock, true),
+    }
+}
+
 /// Mainnet program id for Switchboard v2.
 pub mod switchboard_v2_mainnet {
     solana_program::declare_id!("SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f");

token-lending/program/src/processor.rs

@@ -15,18 +15,11 @@ use crate::{
 };
 use bytemuck::bytes_of;
 use oracles::get_single_price;
+use oracles::get_single_price_unchecked;
 use oracles::pyth::validate_pyth_keys;
-use oracles::switchboard::get_switchboard_price_on_demand;
-use oracles::switchboard::get_switchboard_price_v2;
 use oracles::switchboard::validate_sb_on_demand_keys;
 use oracles::switchboard::validate_switchboard_keys;
-use oracles::{
-    get_oracle_type,
-    pyth::{
-        get_pyth_price_unchecked, get_pyth_pull_price_unchecked, validate_pyth_price_account_info,
-    },
-    OracleType,
-};
+use oracles::{get_oracle_type, pyth::validate_pyth_price_account_info, OracleType};
 use solana_program::{
     account_info::{next_account_info, AccountInfo},
     entrypoint::ProgramResult,
@@ -578,22 +571,10 @@ fn _refresh_reserve<'a>(
                     return Err(LendingError::InvalidAccountInput.into());
                 }
 
-                match get_oracle_type(extra_oracle_account_info)? {
-                    OracleType::Pyth => Some(get_pyth_price_unchecked(extra_oracle_account_info)?),
-                    OracleType::PythPull => {
-                        Some(get_pyth_pull_price_unchecked(extra_oracle_account_info)?)
-                    }
-                    OracleType::Switchboard => Some(get_switchboard_price_v2(
-                        extra_oracle_account_info,
-                        clock,
-                        false,
-                    )?),
-                    OracleType::SbOnDemand => Some(get_switchboard_price_on_demand(
-                        extra_oracle_account_info,
-                        clock,
-                        true,
-                    )?),
-                }
+                Some(get_single_price_unchecked(
+                    extra_oracle_account_info,
+                    clock,
+                )?)
             }
             None => {
                 msg!("Reserve extra oracle account info missing");