Remap oracle account deserialization errors

Also fix extra space on last error message
metaplex-foundation · May 8, 2024 · cd39bad · cd39bad
1 parent 64bc55b
commit cd39bad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/programs/mpl-core/src/error.rs b/programs/mpl-core/src/error.rs
@@ -158,8 +158,12 @@ pub enum MplCoreError {
     RequiresLifecycleCheck,
 
     /// 37 - Duplicate lifecycle checks were provided for external plugin
-    #[error("Duplicate lifecycle checks were provided for external plugin ")]
+    #[error("Duplicate lifecycle checks were provided for external plugin")]
     DuplicateLifecycleChecks,
+
+    /// 38 - Could not read from oracle account
+    #[error("Could not read from oracle account")]
+    InvalidOracleAccountData,
 }
 
 impl PrintProgramError for MplCoreError {

diff --git a/programs/mpl-core/src/plugins/oracle.rs b/programs/mpl-core/src/plugins/oracle.rs
@@ -90,7 +90,8 @@ impl Oracle {
 
         let offset = self.results_offset.to_offset_usize();
         let validation_result =
-            OracleValidation::deserialize(&mut &(*oracle_account.data).borrow()[offset..])?;
+            OracleValidation::deserialize(&mut &(*oracle_account.data).borrow()[offset..])
+                .map_err(|_| MplCoreError::InvalidOracleAccountData)?;
 
         match validation_result {
             OracleValidation::V1 {