Merge branch 'master' into ao-kvdb-rocksdb-no-bloom

* master:
  kvdb: no overlay (#313)
  Ban duplicates of parity-uil-mem from being linked into the same program (#363)
  Use correct license ID (#362)
  Memtest example for Rocksdb (#349)
  Prep for release (#361)

contract-address/CHANGELOG.md

@@ -5,4 +5,7 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+
+## [0.9.0] - 2020-03-16
 - License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
+- Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361)

contract-address/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "contract-address"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Parity Technologies <[email protected]>"]
-license = "MIT/Apache2.0"
+license = "MIT OR Apache-2.0"
 homepage = "https://github.com/paritytech/parity-common"
 repository = "https://github.com/paritytech/parity-common"
 description = "A utility crate to create an ethereum contract address"
@@ -11,9 +11,9 @@ edition = "2018"
 readme = "README.md"
 
 [dependencies]
-ethereum-types = { version = "0.8.0", path = "../ethereum-types" }
+ethereum-types = { version = "0.9.0", path = "../ethereum-types" }
 rlp = { version = "0.4", path = "../rlp" }
-keccak-hash = { version = "0.4", path = "../keccak-hash", default-features = false }
+keccak-hash = { version = "0.5", path = "../keccak-hash", default-features = false }
 
 [features]
 default = []

ethbloom/CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+
+## [0.9.0] - 2020-03-16
 - Removed `libc` feature. [#317](https://github.com/paritytech/parity-common/pull/317)
 - License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
 

ethbloom/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "ethbloom"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Ethereum bloom filter"
-license = "MIT/Apache2.0"
+license = "MIT OR Apache-2.0"
 documentation = "https://docs.rs/ethbloom"
 homepage = "https://github.com/paritytech/parity-common"
 repository = "https://github.com/paritytech/parity-common"
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 tiny-keccak = { version = "2.0", features = ["keccak"] }
 crunchy = { version = "0.2.2", default-features = false, features = ["limit_256"] }
-fixed-hash = { path = "../fixed-hash", version = "0.5", default-features = false }
+fixed-hash = { path = "../fixed-hash", version = "0.6", default-features = false }
 impl-serde = { path = "../primitive-types/impls/serde", version = "0.3", default-features = false, optional = true }
 impl-rlp = { path = "../primitive-types/impls/rlp", version = "0.2", default-features = false }
 

ethereum-types/CHANGELOG.md

@@ -5,7 +5,10 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+
+## [0.9.0] - 2020-03-16
 - License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
+- Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361)
 
 ### Added
 - Uint error type is re-exported. [#244](https://github.com/paritytech/parity-common/pull/244)

ethereum-types/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "ethereum-types"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Parity Technologies <[email protected]>"]
-license = "MIT/Apache2.0"
+license = "MIT OR Apache-2.0"
 homepage = "https://github.com/paritytech/parity-common"
 description = "Ethereum types"
 edition = "2018"
 
 [dependencies]
-ethbloom = { path = "../ethbloom", version = "0.8", default-features = false }
-fixed-hash = { path = "../fixed-hash", version = "0.5", default-features = false, features = ["byteorder", "rustc-hex"] }
+ethbloom = { path = "../ethbloom", version = "0.9", default-features = false }
+fixed-hash = { path = "../fixed-hash", version = "0.6", default-features = false, features = ["byteorder", "rustc-hex"] }
 uint-crate = { path = "../uint", package = "uint", version = "0.8", default-features = false }
-primitive-types = { path = "../primitive-types", version = "0.6", features = ["rlp", "byteorder", "rustc-hex"], default-features = false }
+primitive-types = { path = "../primitive-types", version = "0.7", features = ["rlp", "byteorder", "rustc-hex"], default-features = false }
 impl-serde = { path = "../primitive-types/impls/serde", version = "0.3.0", default-features = false, optional = true }
 impl-rlp = { path = "../primitive-types/impls/rlp", version = "0.2", default-features = false }
 

fixed-hash/CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+
+## [0.6.0] - 2020-03-16
 - Removed `libc` feature. [#317](https://github.com/paritytech/parity-common/pull/317)
 - License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
 

fixed-hash/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "fixed-hash"
-version = "0.5.2"
+version = "0.6.0"
 authors = ["Parity Technologies <[email protected]>"]
-license = "MIT/Apache2.0"
+license = "MIT OR Apache-2.0"
 homepage = "https://github.com/paritytech/parity-common"
 repository = "https://github.com/paritytech/parity-common"
 description = "Macros to define custom fixed-size hash types"

keccak-hash/CHANGELOG.md

@@ -5,7 +5,10 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+
+## [0.4.2] - 2020-03-16
 - License changed from GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
+- Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361)
 
 ## [0.4.1] - 2019-10-24
 ### Dependencies

keccak-hash/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "keccak-hash"
-version = "0.4.1"
+version = "0.5.0"
 description = "`keccak-hash` is a set of utility functions to facilitate working with Keccak hashes (256/512 bits long)."
 authors = ["Parity Technologies <[email protected]>"]
 repository = "https://github.com/paritytech/parity-common"
 readme = "README.md"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [dependencies]
 tiny-keccak = { version = "2.0", features = ["keccak"] }
-primitive-types = { path = "../primitive-types", version = "0.6", default-features = false }
+primitive-types = { path = "../primitive-types", version = "0.7", default-features = false }
 
 [dev-dependencies]
 tempdir = "0.3.7"

kvdb-memorydb/CHANGELOG.md

@@ -5,7 +5,12 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+### Breaking
+- Updated to the new `kvdb` interface. [#313](https://github.com/paritytech/parity-common/pull/313)
+
+## [0.5.0] - 2020-03-16
 - License changed from GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
+- Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361)
 
 ## [0.4.0] - 2019-02-05
 - Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)

kvdb-memorydb/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "kvdb-memorydb"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["Parity Technologies <[email protected]>"]
 repository = "https://github.com/paritytech/parity-common"
 description = "A key-value in-memory database that implements the  `KeyValueDB` trait"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [dependencies]
-parity-util-mem = { path = "../parity-util-mem", version = "0.5", default-features = false, features = ["std"] }
+parity-util-mem = { path = "../parity-util-mem", version = "0.6", default-features = false, features = ["std"] }
 parking_lot = "0.10.0"
-kvdb = { version = "0.4", path = "../kvdb" }
+kvdb = { version = "0.5", path = "../kvdb" }
 
 [dev-dependencies]
 kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.2" }

kvdb-memorydb/src/lib.rs

@@ -52,7 +52,7 @@ impl KeyValueDB for InMemory {
 		}
 	}
 
-	fn write_buffered(&self, transaction: DBTransaction) {
+	fn write(&self, transaction: DBTransaction) -> io::Result<()> {
 		let mut columns = self.columns.write();
 		let ops = transaction.ops;
 		for op in ops {
@@ -69,9 +69,6 @@ impl KeyValueDB for InMemory {
 				}
 			}
 		}
-	}
-
-	fn flush(&self) -> io::Result<()> {
 		Ok(())
 	}
 

kvdb-rocksdb/CHANGELOG.md

@@ -5,8 +5,13 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+### Breaking
+- Updated to the new `kvdb` interface. [#313](https://github.com/paritytech/parity-common/pull/313)
 
-## [0.6.0] - 2019-02-28
+## [0.7.0] - 2020-03-16
+- Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361)
+
+## [0.6.0] - 2020-02-28
 - License changed from GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
 - Added `get_statistics` method and `enable_statistics` config parameter. [#347](https://github.com/paritytech/parity-common/pull/347)
 

kvdb-rocksdb/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "kvdb-rocksdb"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Parity Technologies <[email protected]>"]
 repository = "https://github.com/paritytech/parity-common"
 description = "kvdb implementation backed by RocksDB"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [[bench]]
@@ -14,15 +14,14 @@ harness = false
 [dependencies]
 smallvec = "1.0.0"
 fs-swap = "0.2.4"
-interleaved-ordered = "0.1.1"
-kvdb = { version = "0.4" }
+kvdb = { path = "../kvdb", version = "0.5" }
 log = "0.4.8"
 num_cpus = "1.10.1"
 parking_lot = "0.10.0"
 regex = "1.3.1"
 rocksdb = { version = "0.13", features = ["snappy"], default-features = false }
 owning_ref = "0.4.0"
-parity-util-mem = { version = "0.5", default-features = false, features = ["std", "smallvec"] }
+parity-util-mem = { path = "../parity-util-mem", version = "0.6", default-features = false, features = ["std", "smallvec"] }
 
 [dev-dependencies]
 alloc_counter = "0.0.4"
@@ -31,3 +30,7 @@ ethereum-types = { path = "../ethereum-types" }
 kvdb-shared-tests = { version = "0.2" }
 rand = "0.7.2"
 tempdir = "0.3.7"
+keccak-hash = { path = "../keccak-hash" }
+sysinfo = "0.11.7"
+ctrlc = "3.1.4"
+time = "0.1"

kvdb-rocksdb/benches/bench_read_perf.rs

@@ -76,8 +76,6 @@ fn populate(db: &Database) -> io::Result<Vec<H256>> {
 		batch.put(0, &key.as_bytes(), &n_random_bytes(140));
 	}
 	db.write(batch)?;
-	// Clear the overlay
-	db.flush()?;
 	Ok(needles)
 }