WIP - Removed common crate and other unnecessary stuff

purpleprotocol · Jul 22, 2019 · 4915dca · 4915dca
1 parent d0a3da9
commit 4915dca
Show file tree

Hide file tree

Showing 20 changed files with 63 additions and 749 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
     "src/account",
     "src/causality",
     "src/chain",
-    "src/common",
     "src/consensus",
     "src/crypto",
     "src/events",
@@ -46,7 +45,6 @@ consensus = { path = "src/consensus" }
 persistence = { path = "src/persistence" }
 network = { path = "src/network" }
 transactions = { path = "src/transactions" }
-common = { path = "src/common" }
 chain = { path = "src/chain" }
 miner = { path = "src/miner" }
 mimalloc = "0.1.5"

diff --git a/src/chain/Cargo.toml b/src/chain/Cargo.toml
@@ -17,7 +17,6 @@ patricia-trie = "0.3.0"
 account = { path = "../account" }
 crypto = { path = "../crypto" }
 events = { path = "../events" }
-common = { path = "../common" }
 consensus = { path = "../consensus" }
 persistence = { path = "../persistence" }
 bin-tools = { path = "../util/bin-tools/" }

diff --git a/src/chain/src/block.rs b/src/chain/src/block.rs
@@ -17,7 +17,6 @@
 */
 
 use crate::{ChainErr, EasyBlock, HardBlock, StateBlock};
-use common::Checkpointable;
 use chrono::prelude::*;
 use crypto::Hash;
 use std::boxed::Box;
@@ -29,7 +28,7 @@ use std::hash::Hash as HashTrait;
 /// Generic block interface
 pub trait Block: Debug + PartialEq + Eq + HashTrait {
     /// Per tip validation state
-    type ChainState: Clone + Checkpointable + Debug;
+    type ChainState: Clone + Debug;
 
     /// Size of the block cache.
     const BLOCK_CACHE_SIZE: usize = 20;