From ec39e6b3a2528ea14214195f88d6be0d4db1f84f Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 11 Mar 2020 15:21:01 +0100 Subject: [PATCH 1/3] kvdb: remove parity-bytes dependency --- kvdb/Cargo.toml | 1 - kvdb/src/lib.rs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/kvdb/Cargo.toml b/kvdb/Cargo.toml index c955920a9..722ebcc20 100644 --- a/kvdb/Cargo.toml +++ b/kvdb/Cargo.toml @@ -9,5 +9,4 @@ edition = "2018" [dependencies] smallvec = "1.0.0" -bytes = { package = "parity-bytes", version = "0.1", path = "../parity-bytes" } parity-util-mem = { path = "../parity-util-mem", version = "0.5", default-features = false } diff --git a/kvdb/src/lib.rs b/kvdb/src/lib.rs index 6382145ce..723714de5 100644 --- a/kvdb/src/lib.rs +++ b/kvdb/src/lib.rs @@ -8,7 +8,6 @@ //! Key-Value store abstraction. -use bytes::Bytes; use smallvec::SmallVec; use std::io; @@ -73,7 +72,7 @@ impl DBTransaction { } /// Insert a key-value pair in the transaction. Any existing value will be overwritten upon write. - pub fn put_vec(&mut self, col: u32, key: &[u8], value: Bytes) { + pub fn put_vec(&mut self, col: u32, key: &[u8], value: Vec) { self.ops.push(DBOp::Insert { col, key: DBKey::from_slice(key), value }); } From 46b1866495e9d0f99a1375bb9ce1e634e3664050 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 11 Mar 2020 15:23:09 +0100 Subject: [PATCH 2/3] kvdb: update changelog --- kvdb/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/kvdb/CHANGELOG.md b/kvdb/CHANGELOG.md index c7d38231b..b60db38f8 100644 --- a/kvdb/CHANGELOG.md +++ b/kvdb/CHANGELOG.md @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog]. ## [Unreleased] - License changed from GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342) +- Remove dependency on parity-bytes. [#351](https://github.com/paritytech/parity-common/pull/351) ## [0.4.0] - 2019-01-06 - Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332) From f116eae19a13553194c8ca749b225d12bc1e802a Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Fri, 13 Mar 2020 00:05:40 +0100 Subject: [PATCH 3/3] Update kvdb/CHANGELOG.md --- kvdb/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kvdb/CHANGELOG.md b/kvdb/CHANGELOG.md index b60db38f8..d1e24ebb3 100644 --- a/kvdb/CHANGELOG.md +++ b/kvdb/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog]. ## [Unreleased] - License changed from GPL3 to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342) -- Remove dependency on parity-bytes. [#351](https://github.com/paritytech/parity-common/pull/351) +- Remove dependency on parity-bytes. [#351](https://github.com/paritytech/parity-common/pull/351) ## [0.4.0] - 2019-01-06 - Bump parking_lot to 0.10. [#332](https://github.com/paritytech/parity-common/pull/332)