Refactor load product

Author: guibescos

program/rust/src/rust_oracle.rs

@@ -137,9 +137,6 @@ pub fn add_price(
     accounts: &[AccountInfo],
     instruction_data: &[u8],
 ) -> OracleResult {
-    if instruction_data.len() < size_of::<cmd_add_price_t>() {
-        return Err(ProgramError::InvalidArgument);
-    }
     let cmd_args = load::<cmd_add_price_t>(instruction_data)?;
 
     if cmd_args.expo_ > PC_MAX_NUM_DECIMALS as i32
@@ -153,40 +150,29 @@ pub fn add_price(
         [x, y, z]
             if valid_funding_account(x)
                 && valid_signable_account(program_id, y, PC_PROD_ACC_SIZE as usize)
-                && valid_signable_account(program_id, z, size_of::<pc_price_t>()) =>
+                && valid_signable_account(program_id, z, size_of::<pc_price_t>())
+                && valid_fresh_account(z) =>
         {
             Ok([x, y, z])
         }
         _ => Err(ProgramError::InvalidArgument),
     }?;
 
-    let mut product_data = load_account_as_mut::<pc_prod_t>(product_account)?;
-    {
-        let price_data = load_account_as::<pc_price_t>(price_account)?;
-
-        if product_data.magic_ != PC_MAGIC
-            || product_data.ver_ != cmd_args.ver_
-            || product_data.type_ != PC_ACCTYPE_PRODUCT
-            || price_data.magic_ != 0
-        {
-            return Err(ProgramError::InvalidArgument);
-        }
-    }
+    let mut product_data = load_product_account_mut(product_account, cmd_args.ver_)?;
 
     clear_account(price_account)?;
 
-    {
-        let mut price_data = load_account_as_mut::<pc_price_t>(price_account)?;
-        price_data.magic_ = PC_MAGIC;
-        price_data.ver_ = cmd_args.ver_;
-        price_data.type_ = PC_ACCTYPE_PRICE;
-        price_data.size_ = (size_of::<pc_price_t>() - size_of_val(&price_data.comp_)) as u32;
-        price_data.expo_ = cmd_args.expo_;
-        price_data.ptype_ = cmd_args.ptype_;
-        price_data.prod_.k1_ = product_account.key.to_bytes();
-        price_data.next_ = product_data.px_acc_;
-        product_data.px_acc_.k1_ = price_account.key.to_bytes();
-    }
+    let mut price_data = load_account_as_mut::<pc_price_t>(price_account)?;
+    price_data.magic_ = PC_MAGIC;
+    price_data.ver_ = cmd_args.ver_;
+    price_data.type_ = PC_ACCTYPE_PRICE;
+    price_data.size_ = (size_of::<pc_price_t>() - size_of_val(&price_data.comp_)) as u32;
+    price_data.expo_ = cmd_args.expo_;
+    price_data.ptype_ = cmd_args.ptype_;
+    price_data.prod_.k1_ = product_account.key.to_bytes();
+    price_data.next_ = product_data.px_acc_;
+    product_data.px_acc_.k1_ = price_account.key.to_bytes();
+
     Ok(SUCCESS)
 }
 
@@ -265,17 +251,16 @@ fn load_mapping_account_mut<'a>(
     account: &'a AccountInfo,
     expected_version: u32,
 ) -> Result<RefMut<'a, pc_map_table_t>, ProgramError> {
-    let mapping_account_ref = load_account_as_mut::<pc_map_table_t>(account)?;
-    let mapping_account = *mapping_account_ref;
+    let mapping_data = load_account_as_mut::<pc_map_table_t>(account)?;
 
     pyth_assert(
-        mapping_account.magic_ == PC_MAGIC
-            && mapping_account.ver_ == expected_version
-            && mapping_account.type_ == PC_ACCTYPE_MAPPING,
+        mapping_data.magic_ == PC_MAGIC
+            && mapping_data.ver_ == expected_version
+            && mapping_data.type_ == PC_ACCTYPE_MAPPING,
         ProgramError::InvalidArgument,
     )?;
 
-    Ok(mapping_account_ref)
+    Ok(mapping_data)
 }
 
 /// Initialize account as a new mapping account. This function will zero out any existing data in
@@ -292,3 +277,19 @@ fn initialize_mapping_account(account: &AccountInfo, version: u32) -> Result<(),
 
     Ok(())
 }
+
+fn load_product_account_mut<'a>(
+    account: &'a AccountInfo,
+    expected_version: u32,
+) -> Result<RefMut<'a, pc_prod_t>, ProgramError> {
+    let product_data = load_account_as_mut::<pc_prod_t>(account)?;
+
+    pyth_assert(
+        product_data.magic_ == PC_MAGIC
+            && product_data.ver_ == expected_version
+            && product_data.type_ == PC_ACCTYPE_PRODUCT,
+        ProgramError::InvalidArgument,
+    )?;
+
+    Ok(product_data)
+}