Companion to "Updating scale to v3" (#1013)

* Updating dependencies

* Adapting code to scale v3

* cargo fmt

* Fix compilation

* Update Cargo.lock

* TIL  exists

Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
wigy
2022-02-25 14:40:24 +01:00
committed by GitHub
parent 364a88f1dd
commit 6af1dd5f6f
41 changed files with 614 additions and 458 deletions
+2 -2
View File
@@ -25,9 +25,9 @@ cumulus-primitives-core = { path = "../../primitives/core" }
cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
# Other dependencies
codec = { package = "parity-scale-codec", version = "2.3.0", features = [ "derive" ] }
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
futures = { version = "0.3.1", features = ["compat"] }
parking_lot = "0.10.2"
parking_lot = "0.12.0"
tracing = "0.1.25"
[dev-dependencies]
+1 -1
View File
@@ -30,6 +30,6 @@ cumulus-primitives-core = { path = "../../../primitives/core" }
# Other deps
futures = { version = "0.3.8", features = ["compat"] }
codec = { package = "parity-scale-codec", version = "2.3.0", features = [ "derive" ] }
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
tracing = "0.1.31"
async-trait = "0.1.42"
+1 -1
View File
@@ -23,7 +23,7 @@ cumulus-relay-chain-interface = { path = "../../relay-chain-interface" }
# Other deps
futures = { version = "0.3.8", features = ["compat"] }
codec = { package = "parity-scale-codec", version = "2.3.0", features = [ "derive" ] }
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
tracing = "0.1.31"
async-trait = "0.1.52"
dyn-clone = "1.0.4"
+1 -1
View File
@@ -23,7 +23,7 @@ polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch =
cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
# other deps
codec = { package = "parity-scale-codec", version = "2.3.0", features = [ "derive" ] }
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
futures = { version = "0.3.1", features = ["compat"] }
futures-timer = "3.0.2"
tracing = "0.1.31"
+2 -2
View File
@@ -335,7 +335,7 @@ where
data: &[u8],
) -> Pin<Box<dyn Future<Output = Result<Validation, BoxedError>> + Send>> {
let relay_chain_interface = self.relay_chain_interface.clone();
let mut data = data.to_vec();
let data = data.to_vec();
let header = header.clone();
let header_encoded = header.encode();
let block_announce_validator = self.clone();
@@ -357,7 +357,7 @@ where
return block_announce_validator.handle_empty_block_announce_data(header).await
}
let block_announce_data = match BlockAnnounceData::decode_all(&mut data) {
let block_announce_data = match BlockAnnounceData::decode_all(&mut data.as_slice()) {
Ok(r) => r,
Err(err) =>
return Err(Box::new(BlockAnnounceError(format!(
+1 -1
View File
@@ -25,7 +25,7 @@ cumulus-primitives-core = { path = "../../primitives/core" }
cumulus-relay-chain-interface = {path = "../relay-chain-interface"}
# other deps
codec = { package = "parity-scale-codec", version = "2.3.0", features = [ "derive" ] }
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
futures = { version = "0.3.1", features = ["compat"] }
futures-timer = "3.0.2"
tracing = "0.1.31"
+1 -1
View File
@@ -31,6 +31,6 @@ polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch =
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
# Other deps
codec = { package = "parity-scale-codec", version = "3.0.0" }
tracing = "0.1.31"
codec = { package = "parity-scale-codec", version = "2.3.0" }
parking_lot = "0.12.0"