fix merge

paradigmxyz · Dec 15, 2023 · 58b406b · 58b406b
1 parent 5dff296
commit 58b406b
Showing 1 changed file with 45 additions and 48 deletions.
diff --git a/crates/storage/provider/src/providers/database/mod.rs b/crates/storage/provider/src/providers/database/mod.rs
@@ -46,41 +46,38 @@ pub struct ProviderFactory<DB> {
     snapshot_provider: Option<Arc<SnapshotProvider>>,
 }
 
-impl<DB: Database> ProviderFactory<DB> {
-    /// Returns a provider with a created `DbTx` inside, which allows fetching data from the
-    /// database using different types of providers. Example: [`HeaderProvider`]
-    /// [`BlockHashReader`]. This may fail if the inner read database transaction fails to open.
-    pub fn provider(&self) -> ProviderResult<DatabaseProviderRO<DB>> {
-        let mut provider = DatabaseProvider::new(self.db.tx()?, self.chain_spec.clone());
-
-        if let Some(snapshot_provider) = &self.snapshot_provider {
-            provider = provider.with_snapshot_provider(snapshot_provider.clone());
-        }
-
-        Ok(provider)
-    }
-
-    /// Returns a provider with a created `DbTxMut` inside, which allows fetching and updating
-    /// data from the database using different types of providers. Example: [`HeaderProvider`]
-    /// [`BlockHashReader`].  This may fail if the inner read/write database transaction fails to
-    /// open.
-    pub fn provider_rw(&self) -> ProviderResult<DatabaseProviderRW<DB>> {
-        let mut provider = DatabaseProvider::new_rw(self.db.tx_mut()?, self.chain_spec.clone());
-
-        if let Some(snapshot_provider) = &self.snapshot_provider {
-            provider = provider.with_snapshot_provider(snapshot_provider.clone());
+impl<DB: Clone> Clone for ProviderFactory<DB> {
+    fn clone(&self) -> Self {
+        Self {
+            db: self.db.clone(),
+            chain_spec: Arc::clone(&self.chain_spec),
+            snapshot_provider: self.snapshot_provider.clone(),
         }
-
-        Ok(DatabaseProviderRW(provider))
     }
 }
 
+impl<DB: Database> ProviderFactory<DB> {}
+
 impl<DB> ProviderFactory<DB> {
-    /// create new database provider
+    /// Create new database provider factory.
     pub fn new(db: DB, chain_spec: Arc<ChainSpec>) -> Self {
         Self { db, chain_spec, snapshot_provider: None }
     }
 
+    /// create new database provider by passing a path. [`ProviderFactory`] will own the database
+    /// instance.
+    pub fn new_with_database_path<P: AsRef<Path>>(
+        path: P,
+        chain_spec: Arc<ChainSpec>,
+        log_level: Option<LogLevel>,
+    ) -> RethResult<ProviderFactory<DatabaseEnv>> {
+        Ok(ProviderFactory::<DatabaseEnv> {
+            db: init_db(path, log_level).map_err(|e| RethError::Custom(e.to_string()))?,
+            chain_spec,
+            snapshot_provider: None,
+        })
+    }
+
     /// database provider comes with a shared snapshot provider
     pub fn with_snapshots(
         mut self,
@@ -101,32 +98,32 @@ impl<DB> ProviderFactory<DB> {
 }
 
 impl<DB: Database> ProviderFactory<DB> {
-    /// create new database provider by passing a path. [`ProviderFactory`] will own the database
-    /// instance.
-    pub fn new_with_database_path<P: AsRef<Path>>(
-        path: P,
-        chain_spec: Arc<ChainSpec>,
-        log_level: Option<LogLevel>,
-    ) -> RethResult<ProviderFactory<DatabaseEnv>> {
-        Ok(ProviderFactory::<DatabaseEnv> {
-            db: init_db(path, log_level).map_err(|e| RethError::Custom(e.to_string()))?,
-            chain_spec,
-            snapshot_provider: None,
-        })
-    }
-}
+    /// Returns a provider with a created `DbTx` inside, which allows fetching data from the
+    /// database using different types of providers. Example: [`HeaderProvider`]
+    /// [`BlockHashReader`]. This may fail if the inner read database transaction fails to open.
+    pub fn provider(&self) -> ProviderResult<DatabaseProviderRO<DB>> {
+        let mut provider = DatabaseProvider::new(self.db.tx()?, self.chain_spec.clone());
 
-impl<DB: Clone> Clone for ProviderFactory<DB> {
-    fn clone(&self) -> Self {
-        Self {
-            db: self.db.clone(),
-            chain_spec: Arc::clone(&self.chain_spec),
-            snapshot_provider: self.snapshot_provider.clone(),
+        if let Some(snapshot_provider) = &self.snapshot_provider {
+            provider = provider.with_snapshot_provider(snapshot_provider.clone());
         }
+
+        Ok(provider)
     }
-}
 
-impl<DB: Database> ProviderFactory<DB> {
+    /// Returns a provider with a created `DbTxMut` inside, which allows fetching and updating
+    /// data from the database using different types of providers. Example: [`HeaderProvider`]
+    /// [`BlockHashReader`].  This may fail if the inner read/write database transaction fails to
+    /// open.
+    pub fn provider_rw(&self) -> ProviderResult<DatabaseProviderRW<DB>> {
+        let mut provider = DatabaseProvider::new_rw(self.db.tx_mut()?, self.chain_spec.clone());
+
+        if let Some(snapshot_provider) = &self.snapshot_provider {
+            provider = provider.with_snapshot_provider(snapshot_provider.clone());
+        }
+
+        Ok(DatabaseProviderRW(provider))
+    }
     /// Storage provider for latest block
     pub fn latest(&self) -> ProviderResult<StateProviderBox> {
         trace!(target: "providers::db", "Returning latest state provider");