Update parity-scale-codec to 2.0 (paritytech#7994)

* update cargo.toml * use 2.0 in mmmr
Cerebellum-Network · AndreiNavoichyk · Nov 30, 2022 · Jan 28, 2021 · Jan 28, 2021 · Jan 28, 2021
commit 93b231e79f5b4e551c34234e89fa4a2e5e9c1510
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }

diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 pallet-aura = { version = "2.0.0", default-features = false, path = "../../../frame/aura" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../../../frame/balances" }

diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
@@ -21,8 +21,8 @@ serde = "1.0.101"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
-kvdb = "0.8.0"
-kvdb-rocksdb = "0.10.0"
+kvdb = "0.9.0"
+kvdb-rocksdb = "0.11.0"
 sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
@@ -37,7 +37,7 @@ fs_extra = "1"
 hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.1.2" }
 sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
@@ -34,7 +34,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0.102", features = ["derive"] }
 futures = { version = "0.3.9", features = ["compat"] }
 hex-literal = "0.3.1"

diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
 sc-executor = { version = "0.8.0", path = "../../../client/executor" }

diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99"
 log = "0.4.8"
 sc-cli = { version = "0.8.0", path = "../../../client/cli" }

diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../../primitives/application-crypto" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.102", optional = true }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }

diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
@@ -17,7 +17,7 @@ pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
 sc-service = { version = "0.8.0", features = ["test-helpers", "db"],  path = "../../../client/service" }
 sc-client-db = { version = "0.8.0", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
 sc-client-api = { version = "2.0.0", path = "../../../client/api/" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
 pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
 pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }

diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
 derive_more = "0.99.2"
 sc-executor = { version = "0.8.0", path = "../executor" }
@@ -24,7 +24,7 @@ futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-kvdb = "0.8.0"
+kvdb = "0.9.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
 lazy_static =  "1.4.0"
@@ -43,7 +43,7 @@ sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-kvdb-memorydb = "0.8.0"
+kvdb-memorydb = "0.9.0"
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime"  }
 thiserror = "1.0.21"
diff --git a/client/api/src/execution_extensions.rs b/client/api/src/execution_extensions.rs
@@ -213,7 +213,7 @@ impl<Block: traits::Block> offchain::TransactionPool for TransactionPoolAdapter<
 		let xt = match Block::Extrinsic::decode(&mut &*data) {
 			Ok(xt) => xt,
 			Err(e) => {
-				log::warn!("Unable to decode extrinsic: {:?}: {}", data, e.what());
+				log::warn!("Unable to decode extrinsic: {:?}: {}", data, e);
 				return Err(());
 			},
 		};

diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
@@ -18,7 +18,7 @@ prost-build = "0.7"
 
 [dependencies]
 async-trait = "0.1"
-codec = { package = "parity-scale-codec", default-features = false, version = "1.3.6" }
+codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
 derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"

diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"

diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml
@@ -23,7 +23,7 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-block-builder = { version = "2.0.0", path = "../../primitives/block-builder" }
 sp-inherents = { version = "2.0.0", path = "../../primitives/inherents" }
 sc-client-api = { version = "2.0.0", path = "../api" }
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 
 [dev-dependencies]
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }

diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
@@ -22,7 +22,7 @@ serde_json = "1.0.41"
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-chain-spec = { version = "2.0.0", path = "../../primitives/chain-spec" }
 sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-consensus-babe = { version = "0.8.0-rc6", path = "../consensus/babe" }
 sp-consensus-babe = { version = "0.8.0-rc6", path = "../../primitives/consensus/babe" }
 sc-consensus-epochs = { version = "0.8.0-rc6", path = "../consensus/epochs" }

diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
@@ -19,7 +19,7 @@ tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "
 futures = "0.3.9"
 fdlimit = "0.2.1"
 libp2p = "0.34.0"
-parity-scale-codec = "1.3.6"
+parity-scale-codec = "2.0.0"
 hex = "0.4.2"
 rand = "0.7.3"
 tiny-bip39 = "0.8.0"

diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
@@ -18,7 +18,7 @@ sp-consensus-aura = { version = "0.8.0", path = "../../../primitives/consensus/a
 sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
 sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
 derive_more = "0.99.2"

diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 sp-consensus-babe = { version = "0.8.0", path = "../../../primitives/consensus/babe" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }

diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
@@ -44,7 +44,7 @@ fn load_decode<B, T>(backend: &B, key: &[u8]) -> ClientResult<Option<T>>
 		T: Decode,
 {
 	let corrupt = |e: codec::Error| {
-		ClientError::Backend(format!("BABE DB is corrupted. Decode error: {}", e.what()))
+		ClientError::Backend(format!("BABE DB is corrupted. Decode error: {}", e))
 	};
 	match backend.get_aux(key)? {
 		None => Ok(None),

diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
 fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
 sp-runtime = {  path = "../../../primitives/runtime" , version = "2.0.0"}

diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
@@ -20,7 +20,7 @@ jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
 

diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }

diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }

diff --git a/client/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs
@@ -41,7 +41,7 @@ fn load_decode<C, T>(backend: &C, key: &[u8]) -> ClientResult<Option<T>>
 		None => Ok(None),
 		Some(t) => T::decode(&mut &t[..])
 			.map_err(
-				|e| ClientError::Backend(format!("Slots DB is corrupted. Decode error: {}", e.what())),
+				|e| ClientError::Backend(format!("Slots DB is corrupted. Decode error: {}", e)),
 			)
 			.map(Some)
 	}

diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
@@ -15,13 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 parking_lot = "0.11.1"
 log = "0.4.8"
-kvdb = "0.8.0"
-kvdb-rocksdb = { version = "0.10.0", optional = true }
-kvdb-memorydb = "0.8.0"
+kvdb = "0.9.0"
+kvdb-rocksdb = { version = "0.11.0", optional = true }
+kvdb-memorydb = "0.9.0"
 linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["std"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["std"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 blake2-rfc = "0.2.18"
 
 sc-client-api = { version = "2.0.0", path = "../api" }
@@ -43,7 +43,7 @@ sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "0.9"
-kvdb-rocksdb = "0.10.0"
+kvdb-rocksdb = "0.11.0"
 tempfile = "3"
 
 [features]

diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-io = { version = "2.0.0", path = "../../primitives/io" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-tasks = { version = "2.0.0", path = "../../primitives/tasks" }

diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 parity-wasm = "0.41.0"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 wasmi = "0.6.2"
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "2.0.0", path = "../../../primitives/allocator" }

diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.8"
 wasmi = "0.6.2"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor-common = { version = "0.8.0", path = "../common" }
 sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }

diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4.8"
 scoped-tls = "1.0"
 parity-wasm = "0.41.0"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor-common = { version = "0.8.0", path = "../common" }
 sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }

diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -22,7 +22,7 @@ sc-service = { version = "0.8.0", path = "../service" }
 futures = "0.3.8"
 log = "0.4.11"
 derive_more = "0.99.11"
-codec = { package = "parity-scale-codec", version = "1.3.5" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 prost = "0.6.1"
 num-traits = "0.2.14"
 parking_lot = "0.11.1"
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
@@ -22,7 +22,7 @@ futures-timer = "3.0.1"
 log = "0.4.8"
 parking_lot = "0.11.1"
 rand = "0.7.2"
-parity-scale-codec = { version = "1.3.6", features = ["derive"] }
+parity-scale-codec = { version = "2.0.0", features = ["derive"] }
 sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
 sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
@@ -43,13 +43,13 @@ sc-network-gossip = { version = "0.8.0", path = "../network-gossip" }
 sp-finality-grandpa = { version = "2.0.0", path = "../../primitives/finality-grandpa" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 sc-block-builder = { version = "0.8.0", path = "../block-builder" }
-finality-grandpa = { version = "0.12.3", features = ["derive-codec"] }
+finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
 pin-project = "0.4.6"
 linked-hash-map = "0.5.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-finality-grandpa = { version = "0.12.3", features = ["derive-codec", "test-helpers"] }
+finality-grandpa = { version = "0.13.0", features = ["derive-codec", "test-helpers"] }
 sc-network = { version = "0.8.0", path = "../network" }
 sc-network-test = { version = "0.8.0", path = "../network/test" }
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }

diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
@@ -14,7 +14,7 @@ sc-rpc = { version = "2.0.0", path = "../../rpc" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-finality-grandpa = { version = "0.12.3", features = ["derive-codec"] }
+finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
@@ -24,7 +24,7 @@ serde = { version = "1.0.105", features = ["derive"] }
 serde_json = "1.0.50"
 log = "0.4.8"
 derive_more = "0.99.2"
-parity-scale-codec = { version = "1.3.6", features = ["derive"] }
+parity-scale-codec = { version = "2.0.0", features = ["derive"] }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 
 [dev-dependencies]

diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
@@ -143,7 +143,7 @@ pub(crate) fn load_decode<B: AuxStore, T: Decode>(
 	match backend.get_aux(key)? {
 		None => Ok(None),
 		Some(t) => T::decode(&mut &t[..])
-			.map_err(|e| ClientError::Backend(format!("GRANDPA DB is corrupted: {}", e.what())))
+			.map_err(|e| ClientError::Backend(format!("GRANDPA DB is corrupted: {}", e)))
 			.map(Some)
 	}
 }

diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
@@ -370,7 +370,7 @@ pub(super) struct NeighborPacket<N> {
 /// A versioned neighbor packet.
 #[derive(Debug, Encode, Decode)]
 pub(super) enum VersionedNeighborPacket<N> {
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	V1(NeighborPacket<N>),
 }
 
@@ -1415,7 +1415,7 @@ impl<Block: BlockT> GossipValidator<Block> {
 				}
 				Err(e) => {
 					message_name = None;
-					debug!(target: "afg", "Error decoding message: {}", e.what());
+					debug!(target: "afg", "Error decoding message: {}", e);
 					telemetry!(CONSENSUS_DEBUG; "afg.err_decoding_msg"; "" => "");
 
 					let len = std::cmp::min(i32::max_value() as usize, data.len()) as i32;

diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 ansi_term = "0.12.1"
 futures = "0.3.9"
 log = "0.4.8"
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sc-network = { version = "0.8.0", path = "../network" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }