chore: derive_more in tempdb (#6494)

Author: LesnyRumcajs

src/db/parity_db.rs

@@ -537,14 +537,7 @@ mod test {
     #[test]
     fn subscription_tests() {
         let db = TempParityDB::new();
-        assert!(
-            db.db
-                .as_ref()
-                .unwrap()
-                .write_ops_broadcast_tx
-                .read()
-                .is_none()
-        );
+        assert!(db.write_ops_broadcast_tx.read().is_none());
         let data = [
             b"h'nglui mglw'nafh".to_vec(),
             b"Cthulhu".to_vec(),
@@ -557,17 +550,11 @@ mod test {
             Cid::new_v1(IPLD_RAW, MultihashCode::Blake2b256.digest(&data[1])),
         ];
 
-        let mut rx1 = db.db.as_ref().unwrap().subscribe_write_ops();
-        let mut rx2 = db.db.as_ref().unwrap().subscribe_write_ops();
+        let mut rx1 = db.subscribe_write_ops();
+        let mut rx2 = db.subscribe_write_ops();
 
         assert!(has_subscribers(
-            db.db
-                .as_ref()
-                .unwrap()
-                .write_ops_broadcast_tx
-                .read()
-                .as_ref()
-                .unwrap()
+            db.write_ops_broadcast_tx.read().as_ref().unwrap()
         ));
 
         for (idx, cid) in cids.iter().enumerate() {
@@ -581,24 +568,11 @@ mod test {
         drop(rx2);
 
         assert!(!has_subscribers(
-            db.db
-                .as_ref()
-                .unwrap()
-                .write_ops_broadcast_tx
-                .read()
-                .as_ref()
-                .unwrap()
+            db.write_ops_broadcast_tx.read().as_ref().unwrap()
         ));
 
-        db.db.as_ref().unwrap().unsubscribe_write_ops();
+        db.unsubscribe_write_ops();
 
-        assert!(
-            db.db
-                .as_ref()
-                .unwrap()
-                .write_ops_broadcast_tx
-                .read()
-                .is_none()
-        );
+        assert!(db.write_ops_broadcast_tx.read().is_none());
     }
 }

src/db/tests/db_utils/parity.rs

@@ -1,13 +1,14 @@
 // Copyright 2019-2026 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use std::ops::Deref;
-
 use crate::db::{parity_db::ParityDb, parity_db_config::ParityDbConfig};
 
 /// Temporary, self-cleaning ParityDB
+#[derive(derive_more::AsRef, derive_more::Deref)]
 pub struct TempParityDB {
-    pub db: Option<ParityDb>,
+    #[deref]
+    #[as_ref]
+    pub db: ParityDb,
     _dir: tempfile::TempDir, // kept for cleaning up during Drop
 }
 
@@ -22,22 +23,8 @@ impl TempParityDB {
         let config = ParityDbConfig::default();
 
         TempParityDB {
-            db: Some(ParityDb::open(path, &config).unwrap()),
+            db: ParityDb::open(path, &config).unwrap(),
             _dir: dir,
         }
     }
 }
-
-impl Deref for TempParityDB {
-    type Target = ParityDb;
-
-    fn deref(&self) -> &Self::Target {
-        self.db.as_ref().unwrap()
-    }
-}
-
-impl AsRef<ParityDb> for TempParityDB {
-    fn as_ref(&self) -> &ParityDb {
-        self.db.as_ref().unwrap()
-    }
-}