From 17eca361e8951362f5c544a2dfe20c9b046bef5f Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 12 Feb 2024 14:23:28 +0200
Subject: [PATCH] chore: remove unused `Default` requirement in `Table`
 generics (#6551)

---
 crates/storage/db/benches/criterion.rs           |  6 +++---
 crates/storage/db/benches/hash_keys.rs           | 12 ++++++------
 crates/storage/db/benches/utils.rs               |  3 +--
 crates/storage/db/src/implementation/mdbx/mod.rs |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/crates/storage/db/benches/criterion.rs b/crates/storage/db/benches/criterion.rs
index 35d9b12c4..39f9dc164 100644
--- a/crates/storage/db/benches/criterion.rs
+++ b/crates/storage/db/benches/criterion.rs
@@ -54,7 +54,7 @@ pub fn serialization(c: &mut Criterion) {
 /// Measures `Encode`, `Decode`, `Compress` and `Decompress`.
 fn measure_table_serialization<T>(group: &mut BenchmarkGroup<'_, WallTime>)
 where
-    T: Table + Default,
+    T: Table,
     T::Key: Default + Clone + for<'de> serde::Deserialize<'de>,
     T::Value: Default + Clone + for<'de> serde::Deserialize<'de>,
 {
@@ -119,7 +119,7 @@ where
 /// Measures `SeqWrite`, `RandomWrite`, `SeqRead` and `RandomRead` using `cursor` and `tx.put`.
 fn measure_table_db<T>(group: &mut BenchmarkGroup<'_, WallTime>)
 where
-    T: Table + Default,
+    T: Table,
     T::Key: Default + Clone + for<'de> serde::Deserialize<'de>,
     T::Value: Default + Clone + for<'de> serde::Deserialize<'de>,
 {
@@ -215,7 +215,7 @@ where
 /// Measures `SeqWrite`, `RandomWrite` and `SeqRead`  using `cursor_dup` and `tx.put`.
 fn measure_dupsort_db<T>(group: &mut BenchmarkGroup<'_, WallTime>)
 where
-    T: Table + Default + DupSort,
+    T: Table + DupSort,
     T::Key: Default + Clone + for<'de> serde::Deserialize<'de>,
     T::Value: Default + Clone + for<'de> serde::Deserialize<'de>,
     T::SubKey: Default + Clone + for<'de> serde::Deserialize<'de>,
diff --git a/crates/storage/db/benches/hash_keys.rs b/crates/storage/db/benches/hash_keys.rs
index 6c5e428d8..1266b8c81 100644
--- a/crates/storage/db/benches/hash_keys.rs
+++ b/crates/storage/db/benches/hash_keys.rs
@@ -40,7 +40,7 @@ pub fn hash_keys(c: &mut Criterion) {
 
 fn measure_table_insertion<T>(group: &mut BenchmarkGroup<'_, WallTime>, size: usize)
 where
-    T: Table + Default,
+    T: Table,
     T::Key: Default
         + Clone
         + for<'de> serde::Deserialize<'de>
@@ -132,7 +132,7 @@ where
 #[allow(clippy::type_complexity)]
 fn generate_batches<T>(size: usize) -> (Vec<TableRow<T>>, Vec<TableRow<T>>)
 where
-    T: Table + Default,
+    T: Table,
     T::Key: std::hash::Hash + Arbitrary,
     T::Value: Arbitrary,
 {
@@ -159,7 +159,7 @@ where
 
 fn append<T>(db: DatabaseEnv, input: Vec<(<T as Table>::Key, <T as Table>::Value)>) -> DatabaseEnv
 where
-    T: Table + Default,
+    T: Table,
 {
     {
         let tx = db.tx_mut().expect("tx");
@@ -177,7 +177,7 @@ where
 
 fn insert<T>(db: DatabaseEnv, input: Vec<(<T as Table>::Key, <T as Table>::Value)>) -> DatabaseEnv
 where
-    T: Table + Default,
+    T: Table,
 {
     {
         let tx = db.tx_mut().expect("tx");
@@ -195,7 +195,7 @@ where
 
 fn put<T>(db: DatabaseEnv, input: Vec<(<T as Table>::Key, <T as Table>::Value)>) -> DatabaseEnv
 where
-    T: Table + Default,
+    T: Table,
 {
     {
         let tx = db.tx_mut().expect("tx");
@@ -223,7 +223,7 @@ struct TableStats {
 
 fn get_table_stats<T>(db: DatabaseEnv)
 where
-    T: Table + Default,
+    T: Table,
 {
     db.view(|tx| {
         let table_db = tx.inner.open_db(Some(T::NAME)).map_err(|_| "Could not open db.").unwrap();
diff --git a/crates/storage/db/benches/utils.rs b/crates/storage/db/benches/utils.rs
index ad290d16b..0e9045584 100644
--- a/crates/storage/db/benches/utils.rs
+++ b/crates/storage/db/benches/utils.rs
@@ -20,7 +20,6 @@ const RANDOM_INDEXES: [usize; 10] = [23, 2, 42, 5, 3, 99, 54, 0, 33, 64];
 #[allow(dead_code)]
 pub(crate) fn load_vectors<T: Table>() -> Vec<(T::Key, Bytes, T::Value, Bytes)>
 where
-    T: Default,
     T::Key: Default + Clone + for<'de> serde::Deserialize<'de>,
     T::Value: Default + Clone + for<'de> serde::Deserialize<'de>,
 {
@@ -54,7 +53,7 @@ pub(crate) fn set_up_db<T>(
     pair: &Vec<(<T as Table>::Key, Bytes, <T as Table>::Value, Bytes)>,
 ) -> DatabaseEnv
 where
-    T: Table + Default,
+    T: Table,
     T::Key: Default + Clone,
     T::Value: Default + Clone,
 {
diff --git a/crates/storage/db/src/implementation/mdbx/mod.rs b/crates/storage/db/src/implementation/mdbx/mod.rs
index 2efd0a748..5dfa32863 100644
--- a/crates/storage/db/src/implementation/mdbx/mod.rs
+++ b/crates/storage/db/src/implementation/mdbx/mod.rs
@@ -122,7 +122,7 @@ impl DatabaseMetrics for DatabaseEnv {
 
         let _ = self
             .view(|tx| {
-                for table in Tables::ALL.iter().map(|table| table.name()) {
+                for table in Tables::ALL.iter().map(Tables::name) {
                     let table_db = tx.inner.open_db(Some(table)).wrap_err("Could not open db.")?;
 
                     let stats = tx