fix: all tests passing and conformance works

Author: prestwich

crates/storage/src/hot/impls/mdbx.rs

@@ -13,7 +13,7 @@ use reth_db::{
     mdbx::{RW, TransactionKind, WriteFlags, tx::Tx},
 };
 use reth_db_api::DatabaseError;
-use reth_libmdbx::{Cursor, RO};
+use reth_libmdbx::{Cursor, DatabaseFlags, RO};
 use std::borrow::Cow;
 
 /// Error type for reth-libmdbx based hot storage.
@@ -179,12 +179,12 @@ impl HotKvWrite for Tx<RW> {
         dual_key: bool,
         fixed_val: bool,
     ) -> Result<(), Self::Error> {
-        let mut flags = Default::default();
+        let mut flags = DatabaseFlags::default();
 
         if dual_key {
-            flags |= reth_libmdbx::DatabaseFlags::DUP_SORT;
+            flags.set(reth_libmdbx::DatabaseFlags::DUP_SORT, true);
             if fixed_val {
-                flags |= reth_libmdbx::DatabaseFlags::DUP_FIXED;
+                flags.set(reth_libmdbx::DatabaseFlags::DUP_FIXED, true);
             }
         }
 

crates/storage/src/hot/impls/mod.rs

@@ -15,7 +15,10 @@ mod test {
     };
     use alloy::primitives::{B256, Bytes, U256, address, b256};
     use reth::primitives::{Account, Bytecode, Header, SealedHeader};
-    use reth_db::BlockNumberList;
+    use reth_db::{
+        BlockNumberList, ClientVersion, mdbx::DatabaseArguments, test_utils::tempdir_path,
+    };
+    use reth_libmdbx::MaxReadTransactionDuration;
 
     #[test]
     fn mem_conformance() {
@@ -25,10 +28,16 @@ mod test {
 
     #[test]
     fn mdbx_conformance() {
-        let db = reth_db::test_utils::create_test_rw_db();
+        let path = tempdir_path();
+        let db = reth_db::create_db(
+            &path,
+            DatabaseArguments::new(ClientVersion::default())
+                .with_max_read_transaction_duration(Some(MaxReadTransactionDuration::Unbounded)),
+        )
+        .unwrap();
 
         // Create tables from the `crate::tables::hot` module
-        let mut writer = db.db().writer().unwrap();
+        let mut writer = db.writer().unwrap();
 
         writer.queue_create::<hot::Headers>().unwrap();
         writer.queue_create::<hot::HeaderNumbers>().unwrap();
@@ -42,7 +51,7 @@ mod test {
 
         writer.commit().expect("Failed to commit table creation");
 
-        conformance(db.db());
+        conformance(&db);
     }
 
     fn conformance<T: HotKv>(hot_kv: &T) {
@@ -235,7 +244,9 @@ mod test {
         // Read account change
         {
             let reader = hot_kv.reader().unwrap();
+
             let read_change = reader.get_account_change(block_number, &addr).unwrap();
+
             assert!(read_change.is_some());
             let change = read_change.unwrap();
             assert_eq!(change.nonce, 10);

crates/storage/src/tables/hot.rs

@@ -35,7 +35,7 @@ table! {
 
 table! {
     /// Records account states before transactions, keyed by (block_number, address).
-    AccountChangeSets<BlockNumber => Address => Account> is 96
+    AccountChangeSets<BlockNumber => Address => Account> is 8 + 32 + 32
 }
 
 table! {