temporary move snapDB to consensus layer, clique and other consensus could use it too;

Author: galaio

src/consensus/mod.rs

@@ -24,6 +24,8 @@ use std::{
 };
 use std::time::{SystemTimeError};
 use tokio::sync::watch;
+use tracing::{*};
+use crate::kv::tables;
 
 #[derive(Debug)]
 pub enum FinalizationChange {
@@ -159,7 +161,7 @@ pub trait Consensus: Debug + Send + Sync + 'static {
     /// To be overridden for consensus validators' snap.
     fn snapshot(
         &mut self,
-        _db: &dyn SnapRW,
+        _db: &dyn SnapDB,
         _block_number: BlockNumber,
         _block_hash: H256,
     ) -> anyhow::Result<(), DuoError> {
@@ -529,3 +531,31 @@ pub fn engine_factory(
         )),
     })
 }
+
+/// to handle snap from db
+pub trait SnapDB: HeaderReader {
+    /// read snap from db
+    fn read_parlia_snap(&self, block_hash: H256) -> anyhow::Result<Option<Snapshot>>;
+    /// write snap into db
+    fn write_parlia_snap(&self, snap: &Snapshot) -> anyhow::Result<()>;
+}
+
+impl<E: EnvironmentKind> SnapDB for MdbxTransaction<'_, RW, E> {
+    fn read_parlia_snap(&self, block_hash: H256) -> anyhow::Result<Option<Snapshot>> {
+        let snap_op = self.get(tables::ColParliaSnapshot, block_hash)?;
+        Ok(match snap_op {
+            None => {
+                None
+            }
+            Some(val) => {
+                Some(serde_json::from_slice(&val)?)
+            }
+        })
+    }
+
+    fn write_parlia_snap(&self, snap: &Snapshot) -> anyhow::Result<()> {
+        debug!("snap store {}, {}", snap.block_number, snap.block_hash);
+        let value = serde_json::to_vec(snap)?;
+        self.set(tables::ColParliaSnapshot, snap.block_hash, value)
+    }
+}

src/consensus/parlia/mod.rs

@@ -4,8 +4,8 @@ mod snapshot;
 mod contract_upgrade;
 mod util;
 mod state;
+pub use snapshot::Snapshot;
 pub use state::{ParliaNewBlockState};
-pub use snapshot::{SnapRW};
 pub use util::{is_system_transaction, SYSTEM_ACCOUNT};
 
 use super::*;
@@ -20,9 +20,6 @@ use std::str;
 
 use crate::{
     consensus::{
-        parlia::{
-            snapshot::{Snapshot},
-        },
         ValidationError, ParliaError
     },
     crypto::go_rng::{RngSource, Shuffle},
@@ -343,7 +340,7 @@ impl Consensus for Parlia {
 
     fn snapshot(
         &mut self,
-        db: &dyn SnapRW,
+        db: &dyn SnapDB,
         block_number: BlockNumber,
         block_hash: H256,
     ) -> anyhow::Result<(), DuoError> {
@@ -360,7 +357,7 @@ impl Consensus for Parlia {
                 break;
             }
             if block_number % CHECKPOINT_INTERVAL == 0 {
-                if let Some(cached) = db.read_snap(block_hash)? {
+                if let Some(cached) = db.read_parlia_snap(block_hash)? {
                     debug!("snap find from db {} {:?}", block_number, block_hash);
                     snap = cached;
                     break;
@@ -392,7 +389,7 @@ impl Consensus for Parlia {
         snap_cache.insert(snap.block_hash, snap.clone());
         if snap.block_number % CHECKPOINT_INTERVAL == 0 {
             debug!("snap save {} {:?}", snap.block_number, snap.block_hash);
-            db.write_snap(&snap)?;
+            db.write_parlia_snap(&snap)?;
         }
         return Ok(());
     }

src/consensus/parlia/snapshot.rs

@@ -2,15 +2,12 @@ use crate::{
     consensus::{
         parlia::{util, SIGNATURE_LENGTH, VANITY_LENGTH},*
     },
-    kv::{mdbx::*, tables},
-    HeaderReader,
 };
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap},
 };
 use ethereum_types::{Address};
-use tracing::*;
 
 /// Snapshot, record validators and proposal from epoch chg.
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
@@ -45,7 +42,7 @@ impl Snapshot {
 
     pub fn apply(
         &mut self,
-        db: &dyn SnapRW,
+        db: &dyn SnapDB,
         header: &BlockHeader,
         chain_id: ChainId,
     ) -> Result<Snapshot, DuoError> {
@@ -117,31 +114,3 @@ impl Snapshot {
         -1
     }
 }
-
-/// to handle snap from db
-pub trait SnapRW: HeaderReader {
-    /// read snap from db
-    fn read_snap(&self, block_hash: H256) -> anyhow::Result<Option<Snapshot>>;
-    /// write snap into db
-    fn write_snap(&self, snap: &Snapshot) -> anyhow::Result<()>;
-}
-
-impl<E: EnvironmentKind> SnapRW for MdbxTransaction<'_, RW, E> {
-    fn read_snap(&self, block_hash: H256) -> anyhow::Result<Option<Snapshot>> {
-        let snap_op = self.get(tables::ColParliaSnapshot, block_hash)?;
-        Ok(match snap_op {
-            None => {
-                None
-            }
-            Some(val) => {
-                Some(serde_json::from_slice(&val)?)
-            }
-        })
-    }
-
-    fn write_snap(&self, snap: &Snapshot) -> anyhow::Result<()> {
-        debug!("snap store {}, {}", snap.block_number, snap.block_hash);
-        let value = serde_json::to_vec(snap)?;
-        self.set(tables::ColParliaSnapshot, snap.block_hash, value)
-    }
-}

src/consensus/parlia/util.rs

@@ -131,7 +131,7 @@ pub fn is_similar_tx(actual: &Message, expect: &Message) -> bool {
 
 /// find header.block_number - count, block header
 pub fn find_ancient_header(
-    db: &dyn SnapRW,
+    db: &dyn SnapDB,
     header: &BlockHeader,
     count: u64,
 ) -> Result<BlockHeader, DuoError> {