From 2fdab1ac5e2741687f5c2ec4dca68568945e5f32 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 21 Feb 2020 17:22:10 +0100
Subject: [PATCH 01/17] adding unleash to ci

---
 .gitlab-ci.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36e1da8d108da..344d8e647f239 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,6 +174,9 @@ test-dependency-rules:
       - $DEPLOY_TAG
   script:
     - .maintain/ensure-deps.sh
+    # FIXME set to release
+    - cargo install cargo-unleash --version=1.0.0-alpha2
+    - cargo unleash check
 
 test-frame-staking:
   stage:                           test
@@ -550,6 +553,20 @@ publish-draft-release:
   interruptible:                   true
   allow_failure:                   true
 
+publish-to-crates-io:
+  stage:                           publish
+  image:                           parity/tools:latest
+# FIXME disabled for testing
+#  only:
+#    - tags
+#    - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+  script:
+    # FIXME set to release
+    - cargo install cargo-unleash --version=1.0.0-alpha2
+    - cargo unleash em-dragons --dry-run -skip node-template -skip node-* -skip subkey -s chain-spec-builder
+  interruptible:                   true
+  allow_failure:                   true
+
 .deploy-template:                  &deploy
   stage:                           kubernetes
   when:                            manual

From b9bb7b0bbd0e351728e867bc4975a7676ed6ba05 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 21 Feb 2020 18:15:53 +0100
Subject: [PATCH 02/17] fixing formatting

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 344d8e647f239..2629727de940a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,8 +175,8 @@ test-dependency-rules:
   script:
     - .maintain/ensure-deps.sh
     # FIXME set to release
-    - cargo install cargo-unleash --version=1.0.0-alpha2
-    - cargo unleash check
+    - cargo install cargo-unleash --version 1.0.0-alpha2
+    - cargo unleash check --skip node node-template subkey chain-spec-builder
 
 test-frame-staking:
   stage:                           test
@@ -562,8 +562,8 @@ publish-to-crates-io:
 #    - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
   script:
     # FIXME set to release
-    - cargo install cargo-unleash --version=1.0.0-alpha2
-    - cargo unleash em-dragons --dry-run -skip node-template -skip node-* -skip subkey -s chain-spec-builder
+    - cargo install cargo-unleash --version 1.0.0-alpha2
+    - cargo unleash em-dragons --dry-run --skip node-template node-* subkey chain-spec-builder
   interruptible:                   true
   allow_failure:                   true
 

From d21aef86b23889c56228f4f6c9fba664664fde4a Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 21 Feb 2020 18:45:24 +0100
Subject: [PATCH 03/17] with a dot please

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2629727de940a..d707df692e8cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,7 +175,7 @@ test-dependency-rules:
   script:
     - .maintain/ensure-deps.sh
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha2
+    - cargo install cargo-unleash --version 1.0.0-alpha.2
     - cargo unleash check --skip node node-template subkey chain-spec-builder
 
 test-frame-staking:
@@ -562,7 +562,7 @@ publish-to-crates-io:
 #    - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
   script:
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha2
+    - cargo install cargo-unleash --version 1.0.0-alpha.2
     - cargo unleash em-dragons --dry-run --skip node-template node-* subkey chain-spec-builder
   interruptible:                   true
   allow_failure:                   true

From 57cd5d93f0e25d94da23c9a4bcfa2ea6fcd3e873 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 21 Feb 2020 19:27:26 +0100
Subject: [PATCH 04/17] alpha.3 now

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d707df692e8cd..49e76fa9c7deb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,7 +175,7 @@ test-dependency-rules:
   script:
     - .maintain/ensure-deps.sh
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha.2
+    - cargo install cargo-unleash --version 1.0.0-alpha.3
     - cargo unleash check --skip node node-template subkey chain-spec-builder
 
 test-frame-staking:
@@ -562,7 +562,7 @@ publish-to-crates-io:
 #    - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
   script:
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha.2
+    - cargo install cargo-unleash --version 1.0.0-alpha.3
     - cargo unleash em-dragons --dry-run --skip node-template node-* subkey chain-spec-builder
   interruptible:                   true
   allow_failure:                   true

From e2c488bc0d12e3462096c274cd57c1ef777aa906 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 21 Feb 2020 20:22:47 +0100
Subject: [PATCH 05/17] do not publish testing helpers

---
 bin/node/testing/Cargo.toml                    | 1 +
 test-utils/client/Cargo.toml                   | 1 +
 test-utils/runtime/Cargo.toml                  | 1 +
 test-utils/runtime/transaction-pool/Cargo.toml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index 4530c9576086e..272360bbdb000 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2018"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
+publish = true
 
 [dependencies]
 pallet-balances = { version = "2.0.0-dev", path = "../../../frame/balances" }
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index f4eb93d128f9c..82c3c6957c2d2 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2018"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
+publish = true
 
 [dependencies]
 sc-client-api = { version = "2.0.0-dev", path = "../../client/api" }
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index 44d2a68b49f12..dc9ea20ba7a22 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -7,6 +7,7 @@ build = "build.rs"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
+publish = true
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml
index dfaeb7227f48b..8b5e34be88a2d 100644
--- a/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/test-utils/runtime/transaction-pool/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2018"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [dependencies]
 substrate-test-runtime-client = { version = "2.0.0-dev", path = "../client" }

From 6baff4455c9c2859c8f694ff3a4817ecbddbcd2c Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 21 Feb 2020 20:24:45 +0100
Subject: [PATCH 06/17] remove old test-helpers cruft

---
 client/network/Cargo.toml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 48a6fee638a87..5d223f90319c7 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -49,10 +49,7 @@ sp-blockchain = { version = "2.0.0-dev", path = "../../primitives/blockchain" }
 sp-consensus = { version = "0.8.0-dev", path = "../../primitives/consensus/common" }
 sp-consensus-babe = { version = "0.8.0-dev", path = "../../primitives/consensus/babe" }
 sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
-sp-keyring = { version = "2.0.0-dev", optional = true, path = "../../primitives/keyring" }
 sp-runtime = { version = "2.0.0-dev", path = "../../primitives/runtime" }
-substrate-test-client = { version = "2.0.0-dev", optional = true, path = "../../test-utils/client" }
-substrate-test-runtime-client = { version = "2.0.0-dev", optional = true, path = "../../test-utils/runtime/client" }
 thiserror = "1"
 unsigned-varint = { version = "0.3.1", features = ["futures", "futures-codec"] }
 void = "1.0.2"
@@ -72,4 +69,4 @@ tempfile = "3.1.0"
 
 [features]
 default = []
-test-helpers = ["sp-keyring", "substrate-test-runtime-client"]
+

From 88bf798ce68c16eba3041c2a14eac2bff0613f9d Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 21 Feb 2020 20:27:23 +0100
Subject: [PATCH 07/17] fix cargo.lock

---
 Cargo.lock | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 48b14599b1ca9..01eb804fdc065 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6255,7 +6255,6 @@ dependencies = [
  "sp-keyring",
  "sp-runtime",
  "sp-test-primitives",
- "substrate-test-client",
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",

From 12443ed58ed2708f2964103634dabe499fdc6ec3 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 21 Feb 2020 22:54:44 +0100
Subject: [PATCH 08/17] with alpha 4

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49e76fa9c7deb..b23d60e212b6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,7 +175,7 @@ test-dependency-rules:
   script:
     - .maintain/ensure-deps.sh
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha.3
+    - cargo install cargo-unleash --version 1.0.0-alpha.4
     - cargo unleash check --skip node node-template subkey chain-spec-builder
 
 test-frame-staking:
@@ -562,7 +562,7 @@ publish-to-crates-io:
 #    - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
   script:
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha.3
+    - cargo install cargo-unleash --version 1.0.0-alpha.4
     - cargo unleash em-dragons --dry-run --skip node-template node-* subkey chain-spec-builder
   interruptible:                   true
   allow_failure:                   true

From e2e09d00a8c256bdbd654b1b83209d0a5f09d3a6 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Sat, 22 Feb 2020 00:15:36 +0100
Subject: [PATCH 09/17] do not publish runtime-interface-test either

---
 primitives/runtime-interface/test-wasm/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/primitives/runtime-interface/test-wasm/Cargo.toml b/primitives/runtime-interface/test-wasm/Cargo.toml
index 8461509842ad7..e07adb0195223 100644
--- a/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -7,6 +7,7 @@ build = "build.rs"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [dependencies]
 sp-runtime-interface = { version = "2.0.0-dev", default-features = false, path = "../" }

From 9c0611c0285687c6112ed46b685844213659a759 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Sat, 22 Feb 2020 00:20:31 +0100
Subject: [PATCH 10/17] disable more test crates from publishing

---
 primitives/test-primitives/Cargo.toml | 1 +
 test-utils/client/Cargo.toml          | 2 +-
 test-utils/runtime/Cargo.toml         | 2 +-
 test-utils/runtime/client/Cargo.toml  | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/primitives/test-primitives/Cargo.toml b/primitives/test-primitives/Cargo.toml
index 1cff915f3c4d5..99d070013e5bd 100644
--- a/primitives/test-primitives/Cargo.toml
+++ b/primitives/test-primitives/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2018"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0-dev", default-features = false, path = "../application-crypto" }
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 82c3c6957c2d2..99511f051bec7 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
-publish = true
+publish = false
 
 [dependencies]
 sc-client-api = { version = "2.0.0-dev", path = "../../client/api" }
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index dc9ea20ba7a22..993e44685c9a2 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -7,7 +7,7 @@ build = "build.rs"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
-publish = true
+publish = false
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
diff --git a/test-utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
index a588219690a72..3911bea7839b4 100644
--- a/test-utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2018"
 license = "GPL-3.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [dependencies]
 sc-block-builder = { version = "0.8.0-dev", path = "../../../client/block-builder" }

From 16274a5d6fdf802041dbc94677a72952f9e0c528 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Sat, 22 Feb 2020 00:23:32 +0100
Subject: [PATCH 11/17] switch to alpha.5

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b23d60e212b6d..f65d56f78a8e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,7 +175,7 @@ test-dependency-rules:
   script:
     - .maintain/ensure-deps.sh
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha.4
+    - cargo install cargo-unleash --version 1.0.0-alpha.5
     - cargo unleash check --skip node node-template subkey chain-spec-builder
 
 test-frame-staking:
@@ -562,7 +562,7 @@ publish-to-crates-io:
 #    - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
   script:
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha.4
+    - cargo install cargo-unleash --version 1.0.0-alpha.5
     - cargo unleash em-dragons --dry-run --skip node-template node-* subkey chain-spec-builder
   interruptible:                   true
   allow_failure:                   true

From 4b366177e5853763c82505e817f528b11b4553cd Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Sat, 22 Feb 2020 01:25:07 +0100
Subject: [PATCH 12/17] replace tempdir with tempfile

---
 Cargo.lock                    | 260 ++++++++++++++--------------------
 bin/node/testing/Cargo.toml   |   2 +-
 bin/node/testing/src/bench.rs |   6 +-
 3 files changed, 108 insertions(+), 160 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 01eb804fdc065..ce04347a79aa1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -146,7 +146,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
 dependencies = [
- "quote 1.0.2",
+ "quote",
  "syn",
 ]
 
@@ -305,25 +305,26 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.49.4"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c07087f3d5731bf3fb375a81841b99597e25dc11bd3bc72d16d43adf6624a6e"
+checksum = "99de13bb6361e01e493b3db7928085dcc474b7ba4f5481818e53a89d76b8393f"
 dependencies = [
  "bitflags",
  "cexpr",
  "cfg-if",
  "clang-sys",
  "clap",
- "env_logger 0.6.2",
- "fxhash",
+ "env_logger 0.7.1",
  "lazy_static",
+ "lazycell",
  "log 0.4.8",
  "peeking_take_while",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
+ "proc-macro2",
+ "quote",
  "regex",
+ "rustc-hash",
  "shlex",
- "which 2.0.1",
+ "which",
 ]
 
 [[package]]
@@ -1015,7 +1016,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc"
 dependencies = [
- "quote 1.0.2",
+ "quote",
  "syn",
 ]
 
@@ -1077,8 +1078,8 @@ version = "0.99.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a806e96c59a76a5ba6e18735b6cf833344671e61e7863f2edb5c518ea2cac95c"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -1168,8 +1169,8 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecf634c5213044b8d54a46dd282cf5dd1f86bb5cb53e92c409cb4680a7fb9894"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -1334,8 +1335,8 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
  "synstructure",
 ]
@@ -1530,8 +1531,8 @@ name = "frame-support-procedural"
 version = "2.0.0-dev"
 dependencies = [
  "frame-support-procedural-tools",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -1541,8 +1542,8 @@ version = "2.0.0-dev"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -1550,8 +1551,8 @@ dependencies = [
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-dev"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -1750,8 +1751,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -1828,15 +1829,6 @@ dependencies = [
  "pin-project",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder 1.3.4",
-]
-
 [[package]]
 name = "gcc"
 version = "0.3.55"
@@ -2316,8 +2308,8 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -2439,8 +2431,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -2621,9 +2613,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.66"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
 
 [[package]]
 name = "libloading"
@@ -2712,7 +2704,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d472e9d522f588805c77801de10b957be84e10f019ca5f869fa1825b15ea9b"
 dependencies = [
- "quote 1.0.2",
+ "quote",
  "syn",
 ]
 
@@ -3050,9 +3042,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.2.4"
+version = "6.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0785e816e1e11e7599388a492c61ef80ddc2afc91e313e61662cce537809be"
+checksum = "4e3b727e2dd20ec2fb7ed93f23d9fd5328a0871185485ebdaff007b47d3e27e4"
 dependencies = [
  "bindgen",
  "cc",
@@ -3171,9 +3163,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978"
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 
 [[package]]
 name = "memoffset"
@@ -3693,7 +3685,7 @@ dependencies = [
  "sp-runtime",
  "sp-timestamp",
  "substrate-test-client",
- "tempdir",
+ "tempfile",
  "wabt",
 ]
 
@@ -4417,8 +4409,8 @@ name = "pallet-staking-reward-curve"
 version = "2.0.0-dev"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "sp-runtime",
  "syn",
 ]
@@ -4653,8 +4645,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34e513ff3e406f3ede6796dcdc83d0b32ffb86668cea1ccf7363118abeb00476"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -4685,7 +4677,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
 dependencies = [
- "proc-macro2 1.0.8",
+ "proc-macro2",
  "syn",
  "synstructure",
 ]
@@ -4772,8 +4764,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -4836,8 +4828,8 @@ version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -4950,8 +4942,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "052b3c9af39c7e5e94245f820530487d19eb285faedcb40e0c3275132293f242"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "rustversion",
  "syn",
 ]
@@ -4962,8 +4954,8 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d175bef481c7902e63e3165627123fff3502f06ac043d3ef42d08c1246da9253"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "rustversion",
  "syn",
  "syn-mid",
@@ -4975,8 +4967,8 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -4986,22 +4978,13 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
 
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
 dependencies = [
- "unicode-xid 0.2.0",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -5056,7 +5039,7 @@ dependencies = [
  "prost",
  "prost-types",
  "tempfile",
- "which 3.1.0",
+ "which",
 ]
 
 [[package]]
@@ -5067,8 +5050,8 @@ checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
 dependencies = [
  "anyhow",
  "itertools",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -5128,22 +5111,13 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 dependencies = [
- "proc-macro2 1.0.8",
+ "proc-macro2",
 ]
 
 [[package]]
@@ -5550,8 +5524,8 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3bba175698996010c4f6dce5e7f173b6eb781fce25d2cfc45e27091ce0b79f6"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -5703,8 +5677,8 @@ name = "sc-chain-spec-derive"
 version = "2.0.0-dev"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -6651,8 +6625,8 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -6745,8 +6719,8 @@ version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -6875,8 +6849,8 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -6971,8 +6945,8 @@ version = "2.0.0-dev"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -7186,8 +7160,8 @@ dependencies = [
 name = "sp-debug-derive"
 version = "2.0.0-dev"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -7341,8 +7315,8 @@ version = "2.0.0-dev"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -7589,8 +7563,8 @@ checksum = "095064aa1f5b94d14e635d0a5684cf140c43ae40a0fd990708d38f5d669e5f64"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -7610,8 +7584,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81"
 dependencies = [
  "heck",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -7828,13 +7802,13 @@ checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941"
 
 [[package]]
 name = "syn"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+checksum = "7a0294dc449adc58bb6592fff1a23d3e5e6e235afc6a0ffca2657d19e7bbffe5"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
- "unicode-xid 0.2.0",
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -7843,8 +7817,8 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -7854,10 +7828,10 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
- "unicode-xid 0.2.0",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -7891,16 +7865,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
 
-[[package]]
-name = "tempdir"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-dependencies = [
- "rand 0.4.6",
- "remove_dir_all",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.1.0"
@@ -7931,8 +7895,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a605baa797821796a751f4a959e1206079b24a4b7e1ed302b7d785d81a9276c9"
 dependencies = [
  "lazy_static",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
  "version_check 0.9.1",
 ]
@@ -7961,8 +7925,8 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7b51e1fbc44b5a0840be594fbc0f960be09050f2617e61e6aa43bef97cd3ef4"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -8165,8 +8129,8 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4b1e7ed7d5d4c2af3d999904b0eebe76544897cdbfb2b9684bed2174ab20f7c"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
 ]
 
@@ -8355,7 +8319,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cfd395def5a60236e187e1ff905cb55668a59f29928dec05e6e1b1fd2ac1f3"
 dependencies = [
- "quote 1.0.2",
+ "quote",
  "syn",
 ]
 
@@ -8436,9 +8400,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 
 [[package]]
 name = "trybuild"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5867c525891caf154503954cb743ff7f1c4ca2c3e8578f6a5af84c913aa084c8"
+checksum = "26ff1b18659a2218332848d76ad1c867ce4c6ee37b085e6bc8de9a6d11401220"
 dependencies = [
  "glob 0.3.0",
  "lazy_static",
@@ -8540,12 +8504,6 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
@@ -8718,8 +8676,8 @@ dependencies = [
  "bumpalo",
  "lazy_static",
  "log 0.4.8",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
  "wasm-bindgen-shared",
 ]
@@ -8742,7 +8700,7 @@ version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3"
 dependencies = [
- "quote 1.0.2",
+ "quote",
  "wasm-bindgen-macro-support",
 ]
 
@@ -8752,8 +8710,8 @@ version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
@@ -8774,8 +8732,8 @@ dependencies = [
  "anyhow",
  "heck",
  "log 0.4.8",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
  "wasm-bindgen-backend",
  "weedle",
@@ -9063,16 +9021,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "which"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
-dependencies = [
- "failure",
- "libc",
-]
-
 [[package]]
 name = "which"
 version = "3.1.0"
@@ -9217,8 +9165,8 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
 dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
  "syn",
  "synstructure",
 ]
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index 272360bbdb000..936ae4c52b6ea 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -44,7 +44,7 @@ sp-block-builder = { version = "2.0.0-dev", path = "../../../primitives/block-bu
 sp-inherents = { version = "2.0.0-dev", path = "../../../primitives/inherents" }
 sp-blockchain = { version = "2.0.0-dev", path = "../../../primitives/blockchain" }
 log = "0.4.8"
-tempdir = "0.3"
+tempfile = "3.1.0"
 fs_extra = "1"
 
 [dev-dependencies]
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 5653ba7701646..58a7ab933eeb9 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -81,7 +81,7 @@ pub struct BenchDb {
 impl Clone for BenchDb {
 	fn clone(&self) -> Self {
 		let keyring = self.keyring.clone();
-		let dir = tempdir::TempDir::new("sub-bench").expect("temp dir creation failed");
+		let dir = tempfile::tempdir().expect("temp dir creation failed");
 
 		let seed_dir = self.directory_guard.0.path();
 
@@ -120,7 +120,7 @@ impl BenchDb {
 	pub fn new(keyring_length: usize) -> Self {
 		let keyring = BenchKeyring::new(keyring_length);
 
-		let dir = tempdir::TempDir::new("sub-bench").expect("temp dir creation failed");
+		let dir = tempfile::tempdir().expect("temp dir creation failed");
 		log::trace!(
 			target: "bench-logistics",
 			"Created seed db at {}",
@@ -357,7 +357,7 @@ impl Profile {
 	}
 }
 
-struct Guard(tempdir::TempDir);
+struct Guard(tempfile::TempDir);
 
 impl Guard {
 	fn path(&self) -> &Path {

From cb9483a7f1d1fa9eec394fe9429fb3ce10c03f69 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Sat, 22 Feb 2020 01:45:14 +0100
Subject: [PATCH 13/17] update lru

---
 Cargo.lock                       | 29 +++++++----------------------
 client/network-gossip/Cargo.toml |  2 +-
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce04347a79aa1..715221bb5449f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2002,12 +2002,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
-
 [[package]]
 name = "hashbrown"
 version = "0.6.3"
@@ -2762,7 +2756,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.8",
- "lru 0.4.3",
+ "lru",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3122,22 +3116,13 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "lru"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8f669d42c72d18514dfca8115689c5f6370a17d980cb5bd777a67f404594c8"
-dependencies = [
- "hashbrown 0.5.0",
-]
-
 [[package]]
 name = "lru"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237"
 dependencies = [
- "hashbrown 0.6.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -3184,7 +3169,7 @@ checksum = "198831fe8722331a395bc199a5d08efbc197497ef354cb4c77b969c02ffc0fc4"
 dependencies = [
  "ahash",
  "hash-db",
- "hashbrown 0.6.3",
+ "hashbrown",
  "parity-util-mem",
 ]
 
@@ -6202,7 +6187,7 @@ dependencies = [
  "linked-hash-map",
  "linked_hash_set",
  "log 0.4.8",
- "lru 0.4.3",
+ "lru",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.10.0",
@@ -6247,7 +6232,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log 0.4.8",
- "lru 0.1.17",
+ "lru",
  "parking_lot 0.10.0",
  "sc-network",
  "sp-runtime",
@@ -7042,7 +7027,7 @@ version = "2.0.0-dev"
 dependencies = [
  "derive_more",
  "log 0.4.8",
- "lru 0.4.3",
+ "lru",
  "parity-scale-codec",
  "parking_lot 0.10.0",
  "sp-block-builder",
@@ -8367,7 +8352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de9222c50cc325855621271157c973da27a0dcd26fa06f8edf81020bd2333df0"
 dependencies = [
  "hash-db",
- "hashbrown 0.6.3",
+ "hashbrown",
  "log 0.4.8",
  "rustc-hex",
  "smallvec 1.2.0",
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 25b0548c840c7..d9d1281911f2b 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -13,7 +13,7 @@ futures = "0.3.1"
 futures-timer = "3.0.1"
 libp2p = { version = "0.16.1", default-features = false, features = ["libp2p-websocket"] }
 log = "0.4.8"
-lru = "0.1.2"
+lru = "0.4.3"
 parking_lot = "0.10.0"
 sc-network = { version = "0.8.0-dev", path = "../network" }
 sp-runtime = { version = "2.0.0-dev", path = "../../primitives/runtime" }

From 86bb9483fd84b5299f48aa490f3a226359521d73 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Mon, 24 Feb 2020 14:16:07 +0100
Subject: [PATCH 14/17] switch to bytes 0.5

---
 Cargo.lock                            | 2 +-
 client/authority-discovery/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 715221bb5449f..38021aeeb3267 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5579,7 +5579,7 @@ dependencies = [
 name = "sc-authority-discovery"
 version = "0.8.0-dev"
 dependencies = [
- "bytes 0.4.12",
+ "bytes 0.5.4",
  "derive_more",
  "env_logger 0.7.1",
  "futures 0.3.4",
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index a87a0fee9795d..3ba2436e5da2e 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/paritytech/substrate/"
 prost-build = "0.6.1"
 
 [dependencies]
-bytes = "0.4.12"
+bytes = "0.5.0"
 codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
 derive_more = "0.99.2"
 futures = "0.3.1"

From 137698161790bd6b931f40a867e417b6f38ff74a Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Mon, 24 Feb 2020 14:53:50 +0100
Subject: [PATCH 15/17] release script fixes

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f65d56f78a8e7..2759e892d22ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -555,7 +555,10 @@ publish-draft-release:
 
 publish-to-crates-io:
   stage:                           publish
-  image:                           parity/tools:latest
+  <<:                              *docker-env
+  dependencies:
+    - build-linux-substrate
+    - test-dependency-rules
 # FIXME disabled for testing
 #  only:
 #    - tags

From 628ffcf6a1640f4e38f90ed93b4e998c8e3ededb Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Tue, 25 Feb 2020 11:56:39 +0100
Subject: [PATCH 16/17] switch on and to latest alpha

---
 .gitlab-ci.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2759e892d22ab..e78a4df2ff48d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,9 @@ variables:
   CI_SERVER_NAME:                  "GitLab CI"
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
+  # FIXME set to release
+  CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.6"
+  CARGO_UNLEASH_PKG_DEF:           "--skip node node-* subkey chain-spec-builder"
 
 
 .collect-artifacts:                &collect-artifacts
@@ -175,8 +178,8 @@ test-dependency-rules:
   script:
     - .maintain/ensure-deps.sh
     # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha.5
-    - cargo unleash check --skip node node-template subkey chain-spec-builder
+    - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
+    - cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
 
 test-frame-staking:
   stage:                           test
@@ -559,14 +562,12 @@ publish-to-crates-io:
   dependencies:
     - build-linux-substrate
     - test-dependency-rules
-# FIXME disabled for testing
-#  only:
-#    - tags
-#    - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+ only:
+   - tags
+   - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
   script:
-    # FIXME set to release
-    - cargo install cargo-unleash --version 1.0.0-alpha.5
-    - cargo unleash em-dragons --dry-run --skip node-template node-* subkey chain-spec-builder
+    - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
+    - cargo unleash em-dragons --no-check ${CARGO_UNLEASH_PKG_DEF}
   interruptible:                   true
   allow_failure:                   true
 

From ad91410b50fee29886e5d4a345c6efe388bafeb5 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Tue, 25 Feb 2020 14:34:17 +0100
Subject: [PATCH 17/17] BUT THE SPACES

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e78a4df2ff48d..1fa4a6dadb5d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -562,9 +562,9 @@ publish-to-crates-io:
   dependencies:
     - build-linux-substrate
     - test-dependency-rules
- only:
-   - tags
-   - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+  only:
+    - tags
+    - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
   script:
     - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
     - cargo unleash em-dragons --no-check ${CARGO_UNLEASH_PKG_DEF}