grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename trie to patricia-trie

Browse Source
This commit is contained in:
Hawstein 2017-09-13 01:23:02 +08:00
parent ade37be25b
commit dd7a60c7a8
24 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Cargo.lock generated
View File

@ -576,8 +576,8 @@ dependencies = [
"futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"hardware-wallet 1.8.0",
"hash 0.1.0",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.1.0",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
"itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -589,6 +589,7 @@ dependencies = [
"num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia_trie 0.1.0",
"price-info 1.7.0",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -602,7 +603,6 @@ dependencies = [
"table 0.1.0",
"time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"trie 0.1.0",
"triehash 0.1.0",
"unexpected 0.1.0",
"using_queue 0.1.0",
@ -733,9 +733,10 @@ dependencies = [
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.0",
"parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia_trie 0.1.0",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0",
"rlp_derive 0.1.0",
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -743,7 +744,6 @@ dependencies = [
"smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"stats 0.1.0",
"time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"trie 0.1.0",
"triehash 0.1.0",
"vm 0.1.0",
]
@ -871,23 +871,23 @@ dependencies = [
"ethcore-devtools 1.8.0",
"ethcore-logger 1.8.0",
"hash 0.1.0",
"hashdb 0.1.0",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.1.0",
"memorydb 0.1.0",
"nibbleslice 0.1.0",
"nibblevec 0.1.0",
"parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia_trie 0.1.0",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0",
"rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"trie 0.1.0",
"triehash 0.1.0",
"vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1580,12 +1580,12 @@ dependencies = [
name = "memorydb"
version = "0.1.0"
dependencies = [
"bigint 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3",
"hash 0.1.0",
"hashdb 0.1.0",
"heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0",
]
@ -2373,6 +2373,25 @@ dependencies = [
name = "path"
version = "0.1.0"
[[package]]
name = "patricia_trie"
version = "0.1.0"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-logger 1.8.0",
"hash 0.1.0",
"hashdb 0.1.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.0",
"nibbleslice 0.1.0",
"nibblevec 0.1.0",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0",
"triehash 0.1.0",
]
[[package]]
name = "percent-encoding"
version = "1.0.0"
@ -3304,25 +3323,6 @@ dependencies = [
"protobuf 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "trie"
version = "0.1.0"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-logger 1.8.0",
"hash 0.1.0",
"hashdb 0.1.0",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.0",
"nibbleslice 0.1.0",
"nibblevec 0.1.0",
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0",
"triehash 0.1.0",
]
[[package]]
name = "triehash"
version = "0.1.0"
@ -3464,8 +3464,8 @@ dependencies = [
"hash 0.1.0",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia_trie 0.1.0",
"rlp 0.2.0",
"trie 0.1.0",
]
[[package]]

2
ethcore/Cargo.toml
View File

@ -26,7 +26,7 @@ ethcore-bloom-journal = { path = "../util/bloom" }
ethcore-bytes = { path = "../util/bytes" }
hashdb = { path = "../util/hashdb" }
memorydb = { path = "../util/memorydb" }
trie = { path = "../util/trie" }
patricia_trie = { path = "../util/patricia_trie" }
ethcore-devtools = { path = "../devtools" }
ethcore-io = { path = "../util/io" }
ethcore-ipc = { path = "../ipc/rpc" }

2
ethcore/light/Cargo.toml
View File

@ -17,7 +17,7 @@ ethcore-util = { path = "../../util" }
ethcore-bigint = { path = "../../util/bigint" }
ethcore-bytes = { path = "../../util/bytes" }
memorydb = { path = "../../util/memorydb" }
trie = { path = "../../util/trie" }
patricia_trie = { path = "../../util/patricia_trie" }
ethcore-network = { path = "../../util/network" }
ethcore-io = { path = "../../util/io" }
ethcore-ipc = { path = "../../ipc/rpc", optional = true }

2
ethcore/light/src/lib.rs
View File

@ -78,7 +78,7 @@ extern crate heapsize;
extern crate futures;
extern crate itertools;
extern crate memorydb;
extern crate trie;
extern crate patricia_trie as trie;
extern crate rand;
extern crate rlp;
extern crate parking_lot;

2
ethcore/light/src/types/request/mod.rs
View File

@ -1542,7 +1542,7 @@ pub mod epoch_signal {
use super::{Field, NoSuchOutput, OutputKind, Output};
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use bigint::hash::H256;
use util::Bytes;
use bytes::Bytes;
/// Potentially incomplete epoch signal request.
#[derive(Debug, Clone, PartialEq, Eq)]

2
ethcore/res/wasm-tests

@ -1 +1 @@
Subproject commit 5fd27564f1ab49b25bb419bfc0cc68137e1f12f2
Subproject commit fcac936bf68cc271a6a6ac088efb458f3a08f38a

2
ethcore/src/lib.rs
View File

@ -109,7 +109,7 @@ extern crate rlp;
extern crate hash;
extern crate heapsize;
extern crate memorydb;
extern crate trie;
extern crate patricia_trie as trie;
extern crate triehash;
extern crate ansi_term;
extern crate semantic_version;

2
ethcore/vm/Cargo.toml
View File

@ -8,7 +8,7 @@ byteorder = "1.0"
ethcore-util = { path = "../../util" }
ethcore-bytes = { path = "../../util/bytes" }
ethcore-bigint = { path = "../../util/bigint" }
trie = { path = "../../util/trie" }
patricia_trie = { path = "../../util/patricia_trie" }
log = "0.3"
common-types = { path = "../types" }
evmjit = { path = "../../evmjit", optional = true }

2
ethcore/vm/src/lib.rs
View File

@ -23,7 +23,7 @@ extern crate common_types as types;
extern crate ethjson;
extern crate rlp;
extern crate hash;
extern crate trie;
extern crate patricia_trie as trie;
mod action_params;
mod call_type;

2
util/Cargo.toml
View File

@ -31,7 +31,7 @@ ethcore-logger = { path = "../logger" }
triehash = { path = "triehash" }
error-chain = "0.11.0-rc.2"
hashdb = { path = "hashdb" }
trie = { path = "trie" }
patricia_trie = { path = "patricia_trie" }
nibbleslice = { path = "nibbleslice" }
nibblevec = { path = "nibblevec" }
ethcore-bytes = { path = "bytes" }

2
util/benches/trie.rs
View File

@ -22,7 +22,7 @@ extern crate ethcore_util;
extern crate ethcore_bytes;
extern crate ethcore_bigint;
extern crate memorydb;
extern crate trie;
extern crate patricia_trie as trie;
#[macro_use]
extern crate log;
extern crate hash;

2
util/trie/Cargo.toml → util/patricia_trie/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "trie"
name = "patricia_trie"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]

0
util/trie/src/fatdb.rs → util/patricia_trie/src/fatdb.rs
View File

0
util/trie/src/fatdbmut.rs → util/patricia_trie/src/fatdbmut.rs
View File

0
util/trie/src/lib.rs → util/patricia_trie/src/lib.rs
View File

0
util/trie/src/lookup.rs → util/patricia_trie/src/lookup.rs
View File

0
util/trie/src/node.rs → util/patricia_trie/src/node.rs
View File

0
util/trie/src/recorder.rs → util/patricia_trie/src/recorder.rs
View File

0
util/trie/src/sectriedb.rs → util/patricia_trie/src/sectriedb.rs
View File

0
util/trie/src/sectriedbmut.rs → util/patricia_trie/src/sectriedbmut.rs
View File

0
util/trie/src/standardmap.rs → util/patricia_trie/src/standardmap.rs
View File

2
util/trie/src/triedb.rs → util/patricia_trie/src/triedb.rs
View File

@ -31,7 +31,7 @@ use bytes::{ToPretty, Bytes};
///
/// # Example
/// ```
/// extern crate trie;
/// extern crate patricia_trie as trie;
/// extern crate hashdb;
/// extern crate memorydb;
/// extern crate ethcore_bigint as bigint;

2
util/trie/src/triedbmut.rs → util/patricia_trie/src/triedbmut.rs
View File

@ -261,7 +261,7 @@ impl<'a> Index<&'a StorageHandle> for NodeStorage {
///
/// # Example
/// ```
/// extern crate trie;
/// extern crate patricia_trie as trie;
/// extern crate hashdb;
/// extern crate memorydb;
/// extern crate ethcore_bigint as bigint;

2
util/src/lib.rs
View File

@ -107,7 +107,7 @@ extern crate ethcore_logger;
extern crate hash as keccak;
extern crate hashdb;
extern crate memorydb;
extern crate trie;
extern crate patricia_trie as trie;
#[macro_use]
extern crate error_chain;