Merge duplicated code and support printing component memory usage. (C…

…onflux-Chain#1508)

* Merge duplicated code and upport printing component memory usage.

* Add back Runtime.

* Fix comments.

* Fix more.

* fix comments.

Cargo.toml

@@ -74,17 +74,10 @@ path = "tools/tg_config_gen/main.rs"
 # Use workspace section to allow test all cases under root folder (cargo test --all).
 [workspace]
 
-#[patch.crates-io]
-#kvdb-rocksdb = {path = "./db/src/kvdb-rocksdb"}
-
 [features]
 deadlock_detection = ["parking_lot/deadlock_detection"]
 
-#[replace]
-#"bzip2-sys:0.1.6"={git = "https://github.com/alexcrichton/bzip2-rs.git"}
-
 [patch.crates-io]
-bzip2-sys = { git = "https://github.com/alexcrichton/bzip2-rs.git", commit = "461d6691" }
 sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }
 
 [profile.test]

accounts/cfxkey/Cargo.toml

@@ -20,3 +20,5 @@ serde = "1.0"
 serde_derive = "1.0"
 tiny-keccak = "1.4"
 zeroize = "1.0.0"
+malloc_size_of_derive = {path = "../../util/malloc_size_of_derive"}
+malloc_size_of = {path = "../../util/malloc_size_of"}

accounts/cfxkey/src/keypair.rs

@@ -16,6 +16,7 @@
 
 use super::{Address, Error, Public, Secret, SECP256K1};
 use cfx_types::address_util::AddressUtil;
+use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
 use parity_crypto::Keccak256 as _;
 use secp256k1::key;
 use std::fmt;
@@ -30,7 +31,7 @@ pub fn public_to_address(public: &Public) -> Address {
     result
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, DeriveMallocSizeOf)]
 /// secp256k1 key pair
 pub struct KeyPair {
     secret: Secret,

accounts/cfxkey/src/lib.rs

@@ -23,6 +23,8 @@ extern crate parity_crypto;
 extern crate parity_wordlist;
 #[macro_use]
 extern crate quick_error;
+extern crate malloc_size_of;
+extern crate malloc_size_of_derive;
 extern crate rand;
 extern crate rustc_hex;
 extern crate secp256k1;

accounts/cfxkey/src/secret.rs

@@ -15,13 +15,14 @@
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use ethereum_types::H256;
+use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
 use secp256k1::{constants::SECRET_KEY_SIZE as SECP256K1_SECRET_KEY_SIZE, key};
 use std::{fmt, ops::Deref, str::FromStr};
 use zeroize::Zeroize;
 use Error;
 use SECP256K1;
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, DeriveMallocSizeOf)]
 pub struct Secret {
     inner: H256,
 }

client/Cargo.toml

@@ -62,6 +62,7 @@ futures = { version = "0.3.3", features = ["compat"] }
 rayon = "1.2.0"
 throttling = { path = "../util/throttling" }
 tokio-timer = "0.2.13"
+malloc_size_of = {path = "../util/malloc_size_of"}
 
 [dev-dependencies]
 criterion = "0.2"