Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

journaldb changes #10929

Merged
merged 7 commits into from
Aug 6, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
rename parity-util-mem package in Cargo.toml file
  • Loading branch information
debris committed Jul 31, 2019
commit 9ae0307a615dadd6ed8f94af28ff250ccd4f9924
2 changes: 1 addition & 1 deletion util/journaldb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2018"
parity-bytes = "0.1"
ethereum-types = "0.6.0"
hash-db = "0.12.4"
parity-util-mem = "0.1"
malloc_size_of = { version = "0.1", package = "parity-util-mem" }
keccak-hasher = { path = "../keccak-hasher" }
kvdb = "0.1"
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion util/journaldb/src/archivedb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ use ethereum_types::H256;
use hash_db::{HashDB, Prefix};
use keccak_hasher::KeccakHasher;
use kvdb::{KeyValueDB, DBTransaction, DBValue};
use malloc_size_of::MallocSizeOfExt;
use parity_bytes::Bytes;
use parity_util_mem::MallocSizeOfExt;
use rlp::{encode, decode};

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion util/journaldb/src/earlymergedb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ use hash_db::{HashDB, Prefix};
use keccak_hasher::KeccakHasher;
use kvdb::{KeyValueDB, DBTransaction, DBValue};
use log::{trace, warn};
use malloc_size_of::{MallocSizeOf, allocators::new_malloc_size_ops};
use parity_bytes::Bytes;
use parity_util_mem::{MallocSizeOf, allocators::new_malloc_size_ops};
use parking_lot::RwLock;
use rlp::{encode, decode};

Expand Down
2 changes: 0 additions & 2 deletions util/journaldb/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

//! `JournalDB` interface and implementation.

extern crate parity_util_mem as malloc_size_of;

use std::{
fmt, str, io,
sync::Arc,
Expand Down
2 changes: 1 addition & 1 deletion util/journaldb/src/overlayrecentdb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ use hash_db::{HashDB, Prefix, EMPTY_PREFIX};
use keccak_hasher::KeccakHasher;
use kvdb::{KeyValueDB, DBTransaction, DBValue};
use log::trace;
use malloc_size_of::{MallocSizeOf, allocators::new_malloc_size_ops};
use parity_bytes::Bytes;
use parity_util_mem::{MallocSizeOf, allocators::new_malloc_size_ops};
use parking_lot::RwLock;
use rlp::{Rlp, RlpStream, encode, decode, DecoderError, Decodable, Encodable};

Expand Down
2 changes: 1 addition & 1 deletion util/journaldb/src/refcounteddb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ use hash_db::{HashDB, Prefix, EMPTY_PREFIX};
use keccak_hasher::KeccakHasher;
use kvdb::{KeyValueDB, DBTransaction, DBValue};
use log::trace;
use malloc_size_of::{MallocSizeOf, allocators::new_malloc_size_ops};
use parity_bytes::Bytes;
use parity_util_mem::{MallocSizeOf, allocators::new_malloc_size_ops};
use rlp::{encode, decode};

use crate::{
Expand Down