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

Commit

Permalink
use kvdb-* and parity-snappy crates from crates.io
Browse files Browse the repository at this point in the history
  • Loading branch information
@andresilva
andresilva committed Aug 30, 2018
1 parent 8a5c9a8 commit 7c3a944
Show file tree
Hide file tree
Showing 18 changed files with 113 additions and 108 deletions.
163 changes: 84 additions & 79 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ dir = { path = "util/dir" }
panic_hook = { path = "util/panic_hook" }
keccak-hash = { git = "https://github.com/paritytech/parity-common" }
migration-rocksdb = { path = "util/migration-rocksdb" }
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
kvdb = "0.1.0"
kvdb-rocksdb = "0.1.3"
journaldb = { path = "util/journaldb" }
mem = { path = "util/mem" }

Expand Down
8 changes: 4 additions & 4 deletions ethcore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ rand = "0.4"
rlp = { git = "https://github.com/paritytech/parity-common" }
rlp_compress = { path = "../util/rlp_compress" }
rlp_derive = { path = "../util/rlp_derive" }
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
snappy = { git = "https://github.com/paritytech/rust-snappy" }
kvdb = "0.1.0"
kvdb-memorydb = "0.1.0"
parity-snappy = "0.1.0"
stop-guard = { path = "../util/stop-guard" }
macros = { path = "../util/macros" }
rustc-hex = "1.0"
Expand All @@ -66,7 +66,7 @@ triehash-ethereum = { version = "0.2", path = "../util/triehash-ethereum" }
unexpected = { path = "../util/unexpected" }
journaldb = { path = "../util/journaldb" }
keccak-hasher = { path = "../util/keccak-hasher" }
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
kvdb-rocksdb = "0.1.3"
tempdir = {version="0.3", optional = true}

[target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
Expand Down
4 changes: 2 additions & 2 deletions ethcore/light/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ stats = { path = "../../util/stats" }
keccak-hash = { git = "https://github.com/paritytech/parity-common" }
keccak-hasher = { path = "../../util/keccak-hasher" }
triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" }
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb = "0.1.0"
memory-cache = { path = "../../util/memory_cache" }
error-chain = { version = "0.12", default-features = false }

[dev-dependencies]
ethcore = { path = "..", features = ["test-helpers"] }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
kvdb-memorydb = "0.1.0"
tempdir = "0.3"

[features]
Expand Down
2 changes: 1 addition & 1 deletion ethcore/node_filter/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ lru-cache = "0.1"

[dev-dependencies]
ethcore = { path = "..", features = ["test-helpers"] }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
kvdb-memorydb = "0.1.0"
ethcore-io = { path = "../../util/io" }
tempdir = "0.3"
4 changes: 2 additions & 2 deletions ethcore/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ ethcore-io = { path = "../../util/io" }
ethcore-private-tx = { path = "../private-tx" }
ethcore-sync = { path = "../sync" }
ethereum-types = "0.3"
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb = "0.1.0"
log = "0.4"
stop-guard = { path = "../../util/stop-guard" }
trace-time = { path = "../../util/trace-time" }

[dev-dependencies]
ethcore = { path = "..", features = ["test-helpers"] }
tempdir = "0.3"
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
kvdb-rocksdb = "0.1.3"
2 changes: 1 addition & 1 deletion ethcore/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ extern crate patricia_trie_ethereum as ethtrie;
extern crate triehash_ethereum as triehash;
extern crate ansi_term;
extern crate unexpected;
extern crate snappy;
extern crate parity_snappy as snappy;
extern crate ethabi;
extern crate rustc_hex;
extern crate stats;
Expand Down
4 changes: 2 additions & 2 deletions ethcore/src/snapshot/tests/state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ fn snap_and_restore() {

for chunk_hash in &reader.manifest().state_hashes {
let raw = reader.chunk(*chunk_hash).unwrap();
let chunk = ::snappy::decompress(&raw).unwrap();
let chunk = ::parity_snappy::decompress(&raw).unwrap();

rebuilder.feed(&chunk, &flag).unwrap();
}
Expand Down Expand Up @@ -186,7 +186,7 @@ fn checks_flag() {

for chunk_hash in &reader.manifest().state_hashes {
let raw = reader.chunk(*chunk_hash).unwrap();
let chunk = ::snappy::decompress(&raw).unwrap();
let chunk = ::parity_snappy::decompress(&raw).unwrap();

match rebuilder.feed(&chunk, &flag) {
Err(Error(ErrorKind::Snapshot(SnapshotError::RestorationAborted), _)) => {},
Expand Down
4 changes: 2 additions & 2 deletions ethcore/sync/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rustc-hex = "1.0"
keccak-hash = { git = "https://github.com/paritytech/parity-common" }
keccak-hasher = { path = "../../util/keccak-hasher" }
triehash-ethereum = {version = "0.2", path = "../../util/triehash-ethereum" }
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb = "0.1.0"
macros = { path = "../../util/macros" }
log = "0.4"
env_logger = "0.5"
Expand All @@ -39,6 +39,6 @@ ipnetwork = "0.12.6"
[dev-dependencies]
ethcore-io = { path = "../../util/io", features = ["mio"] }
ethkey = { path = "../../ethkey" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
kvdb-memorydb = "0.1.0"
ethcore-private-tx = { path = "../private-tx" }
ethcore = { path = "..", features = ["test-helpers"] }
4 changes: 2 additions & 2 deletions local-store/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
ethcore = { path = "../ethcore" }
ethcore-io = { path = "../util/io" }
ethcore-transaction = { path = "../ethcore/transaction" }
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb = "0.1.0"
log = "0.4"
rlp = { git = "https://github.com/paritytech/parity-common" }
serde = "1.0"
Expand All @@ -18,4 +18,4 @@ serde_json = "1.0"
[dev-dependencies]
ethcore = { path = "../ethcore", features = ["test-helpers"] }
ethkey = { path = "../ethkey" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
kvdb-memorydb = "0.1.0"
2 changes: 1 addition & 1 deletion rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }
ethcore = { path = "../ethcore", features = ["test-helpers"] }
ethcore-network = { path = "../util/network" }
fake-fetch = { path = "../util/fake-fetch" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
kvdb-memorydb = "0.1.0"
macros = { path = "../util/macros" }
pretty_assertions = "0.1"
transaction-pool = { path = "../transaction-pool" }
4 changes: 2 additions & 2 deletions secret_store/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ethcore-logger = { path = "../logger" }
ethcore-sync = { path = "../ethcore/sync" }
ethcore-transaction = { path = "../ethcore/transaction" }
ethereum-types = "0.3"
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb = "0.1.0"
keccak-hash = { git = "https://github.com/paritytech/parity-common" }
ethkey = { path = "../ethkey" }
lazy_static = "1.0"
Expand All @@ -41,4 +41,4 @@ ethabi-contract = "5.0"
[dev-dependencies]
ethcore = { path = "../ethcore", features = ["test-helpers"] }
tempdir = "0.3"
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
kvdb-rocksdb = "0.1.3"
4 changes: 2 additions & 2 deletions util/journaldb/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ethereum-types = "0.3"
hashdb = { git = "https://github.com/paritytech/parity-common" }
heapsize = "0.4"
keccak-hasher = { path = "../keccak-hasher" }
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb = "0.1.0"
log = "0.4"
memorydb = { git = "https://github.com/paritytech/parity-common" }
parking_lot = "0.6"
Expand All @@ -21,4 +21,4 @@ rlp = { git = "https://github.com/paritytech/parity-common" }
[dev-dependencies]
ethcore-logger = { path = "../../logger" }
keccak-hash = { git = "https://github.com/paritytech/parity-common" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
kvdb-memorydb = "0.1.0"
4 changes: 2 additions & 2 deletions util/migration-rocksdb/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
log = "0.4"
macros = { path = "../macros" }
kvdb = { git = "https://github.com/paritytech/parity-common" }
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
kvdb = "0.1.0"
kvdb-rocksdb = "0.1.3"

[dev-dependencies]
tempdir = "0.3"
2 changes: 1 addition & 1 deletion util/network-devp2p/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ rlp = { git = "https://github.com/paritytech/parity-common" }
path = { git = "https://github.com/paritytech/parity-common" }
ipnetwork = "0.12.6"
keccak-hash = { git = "https://github.com/paritytech/parity-common" }
snappy = { git = "https://github.com/paritytech/rust-snappy" }
parity-snappy = "0.1.0"
serde = "1.0"
serde_json = "1.0"
serde_derive = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion util/network-devp2p/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ extern crate ipnetwork;
extern crate keccak_hash as hash;
extern crate serde;
extern crate serde_json;
extern crate snappy;
extern crate parity_snappy as snappy;

#[macro_use]
extern crate error_chain;
Expand Down
2 changes: 1 addition & 1 deletion util/network/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ethkey = { path = "../../ethkey" }
ipnetwork = "0.12.6"
rlp = { git = "https://github.com/paritytech/parity-common" }
libc = "0.2"
snappy = { git = "https://github.com/paritytech/rust-snappy" }
parity-snappy = "0.1.0"


[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion util/network/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ extern crate ethereum_types;
extern crate ethkey;
extern crate rlp;
extern crate ipnetwork;
extern crate snappy;
extern crate parity_snappy as snappy;
extern crate libc;

#[cfg(test)] #[macro_use]
Expand Down

0 comments on commit 7c3a944

Please sign in to comment.