bump parking_lot to 0.6 (#9013)

* Bump parking_lot to 0.6 * Bump parity-wasm to 0.31 so it gets rid of parking_lot ref paritytech/parity-wasm#206 * Update jsonrpc versions * Update wasmi and pwasm-utils version * Fix compile * Update jsonrpc crates
openethereum · Jul 3, 2018 · e3e2fcc · e3e2fcc
1 parent 00e61a9
commit e3e2fcc
Show file tree

Hide file tree

Showing 32 changed files with 99 additions and 95 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ number_prefix = "0.2"
 rpassword = "1.0"
 semver = "0.9"
 ansi_term = "0.10"
-parking_lot = "0.5"
+parking_lot = "0.6"
 regex = "0.2"
 atty = "0.2.8"
 toml = "0.4"

diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
@@ -13,7 +13,7 @@ futures = "0.1"
 futures-cpupool = "0.1"
 linked-hash-map = "0.5"
 log = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 mime_guess = "2.0.0-alpha.2"
 rand = "0.4"
 rustc-hex = "1.0"

diff --git a/dapps/node-health/Cargo.toml b/dapps/node-health/Cargo.toml
@@ -10,7 +10,7 @@ futures = "0.1"
 futures-cpupool = "0.1"
 log = "0.3"
 ntp = "0.5.0"
-parking_lot = "0.5"
+parking_lot = "0.6"
 serde = "1.0"
 serde_derive = "1.0"
 time = "0.1.35"

diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml
@@ -9,7 +9,7 @@ authors = ["Parity Technologies <[email protected]>"]
 log = "0.3"
 keccak-hash = { path = "../util/hash" }
 primal = "0.2.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 crunchy = "0.1.0"
 memmap = "0.6"
 either = "1.0.0"

diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -45,7 +45,7 @@ lru-cache = "0.1"
 num = { version = "0.1", default-features = false, features = ["bigint"] }
 num_cpus = "1.2"
 parity-machine = { path = "../machine" }
-parking_lot = "0.5"
+parking_lot = "0.6"
 rayon = "1.0"
 rand = "0.4"
 rlp = { path = "../util/rlp" }

diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml
@@ -11,7 +11,7 @@ lazy_static = "1.0"
 log = "0.3"
 vm = { path = "../vm" }
 keccak-hash = { path = "../../util/hash" }
-parking_lot = "0.5"
+parking_lot = "0.6"
 memory-cache = { path = "../../util/memory_cache" }
 
 [dev-dependencies]

diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -30,7 +30,7 @@ itertools = "0.5"
 bincode = "0.8.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.5"
+parking_lot = "0.6"
 stats = { path = "../../util/stats" }
 keccak-hash = { path = "../../util/hash" }
 keccak-hasher = { path = "../../util/keccak-hasher" }

diff --git a/ethcore/node_filter/Cargo.toml b/ethcore/node_filter/Cargo.toml
@@ -12,7 +12,7 @@ ethcore-network = { path = "../../util/network" }
 ethcore-network-devp2p = { path = "../../util/network-devp2p" }
 ethereum-types = "0.3"
 log = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 ethabi = "5.1"
 ethabi-derive = "5.0"
 ethabi-contract = "5.0"

diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml
@@ -24,7 +24,7 @@ fetch = { path = "../../util/fetch" }
 futures = "0.1"
 keccak-hash = { path = "../../util/hash" }
 log = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 patricia-trie = { path = "../../util/patricia_trie" }
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rand = "0.3"

diff --git a/ethcore/stratum/Cargo.toml b/ethcore/stratum/Cargo.toml
@@ -12,7 +12,7 @@ jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "pa
 jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 jsonrpc-tcp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 log = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 
 [dev-dependencies]
 env_logger = "0.4"

diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
@@ -31,7 +31,7 @@ rand = "0.4"
 heapsize = "0.4"
 semver = "0.9"
 smallvec = { version = "0.4", features = ["heapsizeof"] }
-parking_lot = "0.5"
+parking_lot = "0.6"
 trace-time = { path = "../../util/trace-time" }
 ipnetwork = "0.12.6"
 

diff --git a/ethcore/wasm/Cargo.toml b/ethcore/wasm/Cargo.toml
@@ -7,9 +7,9 @@ authors = ["Parity Technologies <[email protected]>"]
 byteorder = "1.0"
 ethereum-types = "0.3"
 log = "0.3"
-parity-wasm = "0.27"
+parity-wasm = "0.31"
 libc = "0.2"
-pwasm-utils = "0.1"
+pwasm-utils = "0.2.2"
 vm = { path = "../vm" }
 ethcore-logger = { path = "../../logger" }
-wasmi = { version = "0.2" }
+wasmi = "0.2.1"
diff --git a/ethcore/wasm/src/parser.rs b/ethcore/wasm/src/parser.rs
@@ -25,7 +25,7 @@ fn gas_rules(wasm_costs: &vm::WasmCosts) -> rules::Set {
 	rules::Set::new(
 		wasm_costs.regular,
 		{
-			let mut vals = ::std::collections::HashMap::with_capacity(8);
+			let mut vals = ::std::collections::BTreeMap::new();
 			vals.insert(rules::InstructionType::Load, rules::Metering::Fixed(wasm_costs.mem as u32));
 			vals.insert(rules::InstructionType::Store, rules::Metering::Fixed(wasm_costs.mem as u32));
 			vals.insert(rules::InstructionType::Div, rules::Metering::Fixed(wasm_costs.div as u32));

diff --git a/ethstore/Cargo.toml b/ethstore/Cargo.toml
@@ -15,7 +15,7 @@ rustc-hex = "1.0"
 tiny-keccak = "1.4"
 time = "0.1.34"
 itertools = "0.5"
-parking_lot = "0.5"
+parking_lot = "0.6"
 ethcore-crypto = { path = "../ethcore/crypto" }
 ethereum-types = "0.3"
 dir = { path = "../util/dir" }

diff --git a/ethstore/cli/Cargo.toml b/ethstore/cli/Cargo.toml
@@ -9,7 +9,7 @@ num_cpus = "1.6"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.5"
+parking_lot = "0.6"
 ethstore = { path = "../" }
 dir = { path = '../../util/dir' }
 panic_hook = { path = "../../util/panic_hook" }

diff --git a/hash-fetch/Cargo.toml b/hash-fetch/Cargo.toml
@@ -27,5 +27,5 @@ ethabi-contract = "5.0"
 
 [dev-dependencies]
 hyper = "0.11"
-parking_lot = "0.5"
+parking_lot = "0.6"
 fake-fetch = { path = "../util/fake-fetch" }
diff --git a/hw/Cargo.toml b/hw/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 log = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 protobuf = "1.4"
 hidapi = { git = "https://github.com/paritytech/hidapi-rs" }
 libusb = { git = "https://github.com/paritytech/libusb-rs" }

diff --git a/logger/Cargo.toml b/logger/Cargo.toml
@@ -12,6 +12,6 @@ atty = "0.2"
 lazy_static = "1.0"
 regex = "0.2"
 time = "0.1"
-parking_lot = "0.5"
+parking_lot = "0.6"
 arrayvec = "0.4"
 ansi_term = "0.10"
diff --git a/miner/Cargo.toml b/miner/Cargo.toml
@@ -25,7 +25,7 @@ heapsize = "0.4"
 keccak-hash = { path = "../util/hash" }
 linked-hash-map = "0.5"
 log = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 price-info = { path = "../price-info" }
 rlp = { path = "../util/rlp" }
 trace-time = { path = "../util/trace-time" }

diff --git a/price-info/Cargo.toml b/price-info/Cargo.toml
@@ -15,5 +15,5 @@ serde_json = "1.0"
 
 [dev-dependencies]
 hyper = "0.11"
-parking_lot = "0.5"
+parking_lot = "0.6"
 fake-fetch = { path = "../util/fake-fetch" }
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -15,7 +15,7 @@ futures-cpupool = "0.1"
 log = "0.3"
 multihash ="0.7"
 order-stat = "0.1"
-parking_lot = "0.5"
+parking_lot = "0.6"
 rand = "0.4"
 rustc-hex = "1.0"
 semver = "0.9"

diff --git a/rpc_client/Cargo.toml b/rpc_client/Cargo.toml
@@ -13,7 +13,7 @@ serde = "1.0"
 serde_json = "1.0"
 url = "1.2.0"
 matches = "0.1"
-parking_lot = "0.5"
+parking_lot = "0.6"
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 parity-rpc = { path = "../rpc" }

diff --git a/secret_store/Cargo.toml b/secret_store/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 byteorder = "1.0"
 log = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 hyper = { version = "0.11", default-features = false }
 serde = "1.0"
 serde_json = "1.0"

diff --git a/updater/Cargo.toml b/updater/Cargo.toml
@@ -18,7 +18,7 @@ ethcore = { path = "../ethcore" }
 ethcore-bytes = { path = "../util/bytes" }
 ethcore-sync = { path = "../ethcore/sync" }
 ethereum-types = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 parity-hash-fetch = { path = "../hash-fetch" }
 parity-version = { path = "../util/version" }
 path = { path = "../util/path" }

diff --git a/util/blooms-db/Cargo.toml b/util/blooms-db/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 byteorder = "1.2"
 ethbloom = "0.5"
-parking_lot = "0.5.4"
+parking_lot = "0.6"
 tiny-keccak = "1.4"
 
 [dev-dependencies]

diff --git a/util/io/Cargo.toml b/util/io/Cargo.toml
@@ -10,7 +10,7 @@ authors = ["Parity Technologies <[email protected]>"]
 fnv = "1.0"
 mio = { version = "0.6.8", optional = true }
 crossbeam = "0.3"
-parking_lot = "0.5"
+parking_lot = "0.6"
 log = "0.3"
 slab = "0.4"
 num_cpus = "1.8"

diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml
@@ -13,8 +13,8 @@ heapsize = "0.4"
 keccak-hasher = { path = "../keccak-hasher" }
 kvdb = { path = "../kvdb" }
 log = "0.3"
-memorydb = { version="0.2.0", path = "../memorydb" }
-parking_lot = "0.5"
+memorydb = { version = "0.2.0", path = "../memorydb" }
+parking_lot = "0.6"
 plain_hasher = { path = "../plain_hasher" }
 rlp = { path = "../rlp" }
 util-error = { path = "../error" }

diff --git a/util/kvdb-memorydb/Cargo.toml b/util/kvdb-memorydb/Cargo.toml
@@ -4,5 +4,5 @@ version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
-parking_lot = "0.5"
+parking_lot = "0.6"
 kvdb = { path = "../kvdb" }
diff --git a/util/kvdb-rocksdb/Cargo.toml b/util/kvdb-rocksdb/Cargo.toml
@@ -11,7 +11,7 @@ interleaved-ordered = "0.1.0"
 kvdb = { path = "../kvdb" }
 log = "0.3"
 num_cpus = "1.0"
-parking_lot = "0.5"
+parking_lot = "0.6"
 regex = "0.2"
 rocksdb = { git = "https://github.com/paritytech/rust-rocksdb" }
 

diff --git a/util/network-devp2p/Cargo.toml b/util/network-devp2p/Cargo.toml
@@ -16,7 +16,7 @@ rust-crypto = "0.2.34"
 slab = "0.2"
 igd = "0.7"
 libc = "0.2.7"
-parking_lot = "0.5"
+parking_lot = "0.6"
 ansi_term = "0.10"
 rustc-hex = "1.0"
 ethcore-io = { path = "../io", features = ["mio"] }

diff --git a/whisper/Cargo.toml b/whisper/Cargo.toml
@@ -15,7 +15,7 @@ hex = "0.2"
 log = "0.3"
 mem = { path = "../util/mem" }
 ordered-float = "0.5"
-parking_lot = "0.5"
+parking_lot = "0.6"
 rand = "0.4"
 rlp = { path = "../util/rlp" }
 serde = "1.0"