Refactor

Author: guibescos

program/rust/src/deserialize.rs

@@ -69,11 +69,10 @@ pub fn load_account_as_mut<'a, T: Pod>(
     }))
 }
 
-pub fn load_checked<'a, T: PythAccount>(
-    account: &'a AccountInfo,
-    version: u32,
+pub fn check_owned_and_rent_exempt_account<T: PythAccount>(
+    account: &AccountInfo,
     program_id: &Pubkey,
-) -> Result<RefMut<'a, T>, ProgramError> {
+) -> Result<(), ProgramError> {
     // Check size and rent
     pyth_assert(
         account.data_len() >= T::minimum_size()
@@ -84,8 +83,17 @@ pub fn load_checked<'a, T: PythAccount>(
     // Check owner
     pyth_assert(
         account.owner == program_id,
-        OracleError::SmallSizeOrNotEnoughRent.into(),
+        OracleError::AccountNotOwnerByOracle.into(),
     )?;
+    Ok(())
+}
+
+pub fn load_checked<'a, T: PythAccount>(
+    account: &'a AccountInfo,
+    version: u32,
+    program_id: &Pubkey,
+) -> Result<RefMut<'a, T>, ProgramError> {
+    check_owned_and_rent_exempt_account::<T>(account, program_id)?;
 
     // Check header
     {