chore(drive): fix drive linting (#2763)

Author: QuantumExplorer

packages/rs-drive-abci/src/execution/engine/initialization/init_chain/v0/mod.rs

@@ -5,7 +5,7 @@ use crate::platform_types::platform::Platform;
 use crate::rpc::core::CoreRPCLike;
 
 use dpp::block::block_info::BlockInfo;
-use drive::error::Error::GroveDB;
+use drive::error;
 use drive::grovedb::Transaction;
 
 use crate::execution::engine::consensus_params_update::consensus_params_update;
@@ -131,7 +131,7 @@ where
             .grove
             .root_hash(Some(transaction), &platform_version.drive.grove_version)
             .unwrap()
-            .map_err(GroveDB)?;
+            .map_err(error::Error::from)?;
 
         // We use first platform version because Tenderdash starts genesis with first versions
         // by default

packages/rs-drive-abci/src/execution/engine/run_block_proposal/v0/mod.rs

@@ -1,7 +1,6 @@
 use dpp::block::epoch::Epoch;
 
 use dpp::validation::ValidationResult;
-use drive::error::Error::GroveDB;
 
 use dpp::version::PlatformVersion;
 use drive::grovedb::Transaction;
@@ -383,7 +382,7 @@ where
             .grove
             .root_hash(Some(transaction), &platform_version.drive.grove_version)
             .unwrap()
-            .map_err(|e| Error::Drive(GroveDB(e)))?; //GroveDb errors are system errors
+            .map_err(|e| Error::Drive(drive::error::Error::from(e)))?; //GroveDb errors are system errors
 
         block_execution_context
             .block_state_info_mut()

packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/v0/mod.rs

@@ -37,7 +37,11 @@ impl<C> Platform<C> {
             )
             .or_else(|e| match e {
                 // Handle epoch change when storage fees are not set yet
-                error::Error::GroveDB(grovedb::Error::PathKeyNotFound(_)) => Ok(0u64),
+                error::Error::GroveDB(inner)
+                    if matches!(inner.as_ref(), grovedb::Error::PathKeyNotFound(_)) =>
+                {
+                    Ok(0u64)
+                }
                 _ => Err(e),
             })?;
 

packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_distribute_fees_from_oldest_unpaid_epoch_pool_to_proposers_operations/v0/mod.rs

@@ -270,9 +270,7 @@ mod tests {
 
         assert!(matches!(
             result,
-            Err(DriveError::GroveDB(
-                grovedb::Error::PathParentLayerNotFound(_)
-            ))
+            Err(DriveError::GroveDB(e)) if matches!(e.as_ref(), grovedb::Error::PathParentLayerNotFound(_))
         ));
     }
 }

packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_distribute_fees_from_oldest_unpaid_epoch_pool_to_proposers_operations/v1/mod.rs

@@ -300,9 +300,7 @@ mod tests {
 
         assert!(matches!(
             result,
-            Err(DriveError::GroveDB(
-                grovedb::Error::PathParentLayerNotFound(_)
-            ))
+            Err(DriveError::GroveDB(e)) if matches!(e.as_ref(), grovedb::Error::PathParentLayerNotFound(_))
         ));
     }
 }

packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs

@@ -287,7 +287,7 @@ impl<C> Platform<C> {
             .map(|element| {
                 let contested_document_resource_vote_poll_bytes = element
                     .into_item_bytes()
-                    .map_err(drive::error::Error::GroveDB)?;
+                    .map_err(drive::error::Error::from)?;
                 let vote_poll =
                     VotePoll::deserialize_from_bytes(&contested_document_resource_vote_poll_bytes)?;
                 match vote_poll {

packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/mod.rs

@@ -9785,9 +9785,8 @@ mod tests {
 
                     assert_matches!(
                         query_validation_result,
-                        Err(Error::Drive(drive::error::Error::GroveDB(
-                            drive::grovedb::Error::CorruptedReferencePathKeyNotFound(_)
-                        )))
+                        Err(Error::Drive(drive::error::Error::GroveDB(e)))
+                            if matches!(e.as_ref(), drive::grovedb::Error::CorruptedReferencePathKeyNotFound(_))
                     )
                 }
 
@@ -10564,9 +10563,8 @@ mod tests {
 
                     assert_matches!(
                         query_validation_result,
-                        Err(Error::Drive(drive::error::Error::GroveDB(
-                            drive::grovedb::Error::CorruptedReferencePathKeyNotFound(_)
-                        )))
+                        Err(Error::Drive(drive::error::Error::GroveDB(e)))
+                            if matches!(e.as_ref(), drive::grovedb::Error::CorruptedReferencePathKeyNotFound(_))
                     )
                 }
 

packages/rs-drive-abci/src/query/system/path_elements/v0/mod.rs

@@ -57,7 +57,7 @@ impl<C> Platform<C> {
                 .map(|element| {
                     element
                         .serialize(&platform_version.drive.grove_version)
-                        .map_err(|e| Error::Drive(drive::error::Error::GroveDB(e)))
+                        .map_err(|e| Error::Drive(drive::error::Error::from(e)))
                 })
                 .collect::<Result<Vec<Vec<u8>>, Error>>()?;
 

packages/rs-drive-proof-verifier/src/error.rs

@@ -124,7 +124,7 @@ impl<O> MapGroveDbError<O> for Result<O, drive::error::Error> {
 
             Err(drive::error::Error::GroveDB(grove_err)) => {
                 // If InvalidProof error is returned, extract the path query from it
-                let maybe_query = match &grove_err {
+                let maybe_query = match grove_err.as_ref() {
                     GroveError::InvalidProof(path_query, ..) => Some(path_query.clone()),
                     _ => None,
                 };

packages/rs-drive-proof-verifier/src/proof.rs

@@ -421,7 +421,7 @@ impl FromProof<platform::GetIdentityByNonUniquePublicKeyHashRequest> for Identit
             .map_err(|e| match e {
                 drive::error::Error::GroveDB(e) => {
                     // If InvalidProof error is returned, extract the path query from it
-                    let maybe_query = match &e {
+                    let maybe_query = match e.as_ref() {
                         GroveError::InvalidProof(path_query, ..) => Some(path_query.clone()),
                         _ => None,
                     };