Commit 68deba84 authored by Cecile Tonglet's avatar Cecile Tonglet
Browse files

Update from parent 'origin/master' (conflicts)

Commit: 0a1c99f2
Parent branch: origin/master
Forked at: 77de8b91
parents f3110886 0a1c99f2
Pipeline #85432 passed with stage
in 13 minutes and 36 seconds
......@@ -379,9 +379,13 @@ checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead"
[[package]]
name = "bitvec"
version = "0.15.2"
version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6"
checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
dependencies = [
"either",
"radium",
]
[[package]]
name = "blake2"
......@@ -3845,9 +3849,9 @@ dependencies = [
[[package]]
name = "parity-scale-codec"
version = "1.2.0"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f509c5e67ca0605ee17dcd3f91ef41cadd685c75a298fb6261b781a5acb3f910"
checksum = "329c8f7f4244ddb5c37c103641027a76c530e65e8e4b8240b29f81ea40508b17"
dependencies = [
"arrayvec 0.5.1",
"bitvec",
......@@ -4798,6 +4802,12 @@ dependencies = [
"proc-macro2 1.0.9",
]
[[package]]
name = "radium"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
[[package]]
name = "rand"
version = "0.3.23"
......
......@@ -14,7 +14,7 @@ log = "0.4.8"
futures = "0.3.4"
tokio = { version = "0.2.13", features = ["rt-core"] }
exit-future = "0.2.0"
codec = { package = "parity-scale-codec", version = "1.1.0", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
......
......@@ -24,7 +24,7 @@ polkadot-service = { path = "../service" }
log = "0.4.8"
tokio = "0.2.13"
futures-timer = "2.0"
codec = { package = "parity-scale-codec", version = "1.1.0" }
codec = { package = "parity-scale-codec", version = "1.3.0" }
[dev-dependencies]
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
......@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
primitives = { package = "polkadot-primitives", path = "../primitives" }
reed_solomon = { package = "reed-solomon-erasure", git = "https://github.com/paritytech/reed-solomon-erasure" }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
derive_more = "0.15.0"
......@@ -14,7 +14,7 @@ av_store = { package = "polkadot-availability-store", path = "../availability-st
polkadot-validation = { path = "../validation" }
polkadot-primitives = { path = "../primitives" }
polkadot-erasure-coding = { path = "../erasure-coding" }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
......
......@@ -6,7 +6,7 @@ description = "Types and utilities for creating and working with parachains"
edition = "2018"
[dependencies]
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = [ "derive" ] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = [ "derive" ] }
derive_more = { version = "0.99.2", optional = true }
serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli", default-features = false }
......
......@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
serde = { version = "1.0.102", optional = true, features = ["derive"] }
parity-scale-codec = { version = "1.1.0", default-features = false, features = ["bit-vec", "derive"] }
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] }
primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli", default-features = false }
application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli", default-features = false }
......@@ -17,7 +17,7 @@ sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli", default-features = false }
polkadot-parachain = { path = "../parachain", default-features = false }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli", default-features = false }
bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli", default-features = false }
[dev-dependencies]
......
......@@ -626,7 +626,7 @@ pub struct AttestedCandidate {
/// Validity attestations.
pub validity_votes: Vec<ValidityAttestation>,
/// Indices of the corresponding validity votes.
pub validator_indices: BitVec<bitvec::cursor::LittleEndian, u8>,
pub validator_indices: BitVec<bitvec::order::Lsb0, u8>,
}
impl AttestedCandidate {
......
......@@ -14,4 +14,4 @@ sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-the
txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
......@@ -5,8 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true }
rustc-hex = { version = "2.0.1", default-features = false }
serde = { version = "1.0.102", default-features = false }
......
......@@ -168,7 +168,7 @@ impl<T: Trait> Module<T> {
let attesting_indices = head.validator_indices
.iter()
.enumerate()
.filter(|(_, bit)| *bit)
.filter(|(_, bit)| **bit)
.inspect(|&(auth_index, _)| {
if let Some(stash_id) = validators.get(auth_index) {
valid.push(stash_id.clone());
......
......@@ -964,7 +964,7 @@ impl<T: Trait> Module<T> {
for (vote_index, (auth_index, _)) in candidate.validator_indices
.iter()
.enumerate()
.filter(|(_, bit)| *bit)
.filter(|(_, bit)| **bit)
.enumerate()
{
let validity_attestation = match candidate.validity_votes.get(vote_index) {
......@@ -1200,7 +1200,7 @@ mod tests {
use sp_trie::NodeCodec;
use sp_runtime::{
impl_opaque_keys,
Perbill, curve::PiecewiseLinear, testing::{Header},
Perbill, curve::PiecewiseLinear, testing::Header,
traits::{
BlakeTwo256, IdentityLookup, SaturatedConversion,
OpaqueKeys,
......
......@@ -6,8 +6,8 @@ edition = "2018"
build = "build.rs"
[dependencies]
bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true }
rustc-hex = { version = "2.0.1", default-features = false }
serde = { version = "1.0.102", default-features = false }
......
......@@ -6,7 +6,7 @@ edition = "2018"
build = "build.rs"
[dependencies]
bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true }
rustc-hex = { version = "2.0.1", default-features = false }
......
......@@ -6,8 +6,8 @@ edition = "2018"
build = "build.rs"
[dependencies]
bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true }
rustc-hex = { version = "2.0.1", default-features = false }
serde = { version = "1.0.102", default-features = false }
......
......@@ -49,7 +49,7 @@ babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/par
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
codec = { package = "parity-scale-codec", version = "1.1.0" }
codec = { package = "parity-scale-codec", version = "1.3.0" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
......
......@@ -5,6 +5,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
primitives = { package = "polkadot-primitives", path = "../primitives" }
......@@ -8,7 +8,7 @@ build = "build.rs"
[dependencies]
parachain = { package = "polkadot-parachain", path = "../../parachain/", default-features = false, features = [ "wasm-api" ] }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
tiny-keccak = "1.5.0"
dlmalloc = { version = "0.1.3", features = [ "global" ] }
......
......@@ -12,7 +12,7 @@ tokio = { version = "0.2.13", features = ["rt-core", "blocking"] }
derive_more = "0.14.1"
log = "0.4.8"
exit-future = "0.2.0"
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
availability_store = { package = "polkadot-availability-store", path = "../availability-store" }
parachain = { package = "polkadot-parachain", path = "../parachain" }
polkadot-primitives = { path = "../primitives" }
......@@ -30,7 +30,7 @@ sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cect
block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-the-revenge-of-the-cli" }
......
......@@ -549,7 +549,7 @@ impl SharedTable {
validity_votes.sort_by(|(id1, _), (id2, _)| id1.cmp(id2));
let mut validator_indices = bitvec![
bitvec::cursor::LittleEndian, u8;
bitvec::order::Lsb0, u8;
0;
validity_votes.last().map(|(i, _)| i + 1).unwrap_or_default()
];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment