diff --git a/node/subsystem/src/messages.rs b/node/subsystem/src/messages.rs index fb4300f561c6..1ff4986b0675 100644 --- a/node/subsystem/src/messages.rs +++ b/node/subsystem/src/messages.rs @@ -27,7 +27,7 @@ use futures::channel::{mpsc, oneshot}; use polkadot_primitives::{BlockNumber, Hash, Signature}; use polkadot_primitives::parachain::{ AbridgedCandidateReceipt, PoVBlock, ErasureChunk, BackedCandidate, Id as ParaId, - SignedAvailabilityBitfield, SignedAvailabilityBitfields, SigningContext, ValidatorId, ValidationCode, ValidatorIndex, + SignedAvailabilityBitfield, SigningContext, ValidatorId, ValidationCode, ValidatorIndex, }; use polkadot_node_primitives::{ MisbehaviorReport, SignedFullStatement, View, ProtocolId, @@ -194,7 +194,7 @@ pub enum ProvisionableData { /// This data needs to make its way from the provisioner into the InherentData. /// /// There, it is used to construct the InclusionInherent. -pub type ProvisionerInherentData = (SignedAvailabilityBitfields, Vec); +pub type ProvisionerInherentData = (Vec, Vec); /// Message to the Provisioner. /// diff --git a/primitives/src/parachain.rs b/primitives/src/parachain.rs index 4a10fea6991c..b187d488e191 100644 --- a/primitives/src/parachain.rs +++ b/primitives/src/parachain.rs @@ -736,14 +736,7 @@ impl From> for AvailabilityBitfield { pub type SignedAvailabilityBitfield = Signed; /// A set of signed availability bitfields. Should be sorted by validator index, ascending. -#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, Default)] -pub struct SignedAvailabilityBitfields(pub Vec); - -impl From> for SignedAvailabilityBitfields { - fn from(fields: Vec) -> SignedAvailabilityBitfields { - SignedAvailabilityBitfields(fields) - } -} +pub type SignedAvailabilityBitfields = Vec; /// A backed (or backable, depending on context) candidate. // TODO: yes, this is roughly the same as AttestedCandidate. diff --git a/runtime/parachains/src/inclusion.rs b/runtime/parachains/src/inclusion.rs index c31c4a62e6e2..f9696bb33cdc 100644 --- a/runtime/parachains/src/inclusion.rs +++ b/runtime/parachains/src/inclusion.rs @@ -190,7 +190,7 @@ impl Module { session_index, }; - for signed_bitfield in &signed_bitfields.0 { + for signed_bitfield in &signed_bitfields { ensure!( signed_bitfield.payload().0.len() == n_bits, Error::::WrongBitfieldSize, @@ -220,7 +220,7 @@ impl Module { } let now = >::block_number(); - for signed_bitfield in signed_bitfields.0 { + for signed_bitfield in signed_bitfields { for (bit_idx, _) in signed_bitfield.payload().0.iter().enumerate().filter(|(_, is_av)| **is_av) { @@ -755,7 +755,7 @@ mod tests { ); assert!(Inclusion::process_bitfields( - SignedAvailabilityBitfields(vec![signed]), + vec![signed], &core_lookup, ).is_err()); } @@ -771,7 +771,7 @@ mod tests { ); assert!(Inclusion::process_bitfields( - SignedAvailabilityBitfields(vec![signed.clone(), signed]), + vec![signed.clone(), signed], &core_lookup, ).is_err()); } @@ -794,7 +794,7 @@ mod tests { ); assert!(Inclusion::process_bitfields( - SignedAvailabilityBitfields(vec![signed_1, signed_0]), + vec![signed_1, signed_0], &core_lookup, ).is_err()); } @@ -811,7 +811,7 @@ mod tests { ); assert!(Inclusion::process_bitfields( - SignedAvailabilityBitfields(vec![signed]), + vec![signed], &core_lookup, ).is_err()); } @@ -827,7 +827,7 @@ mod tests { ); assert!(Inclusion::process_bitfields( - SignedAvailabilityBitfields(vec![signed]), + vec![signed], &core_lookup, ).is_ok()); } @@ -855,7 +855,7 @@ mod tests { ); assert!(Inclusion::process_bitfields( - SignedAvailabilityBitfields(vec![signed]), + vec![signed], &core_lookup, ).is_ok()); } @@ -959,7 +959,7 @@ mod tests { }).collect(); assert!(Inclusion::process_bitfields( - SignedAvailabilityBitfields(signed_bitfields), + signed_bitfields, &core_lookup, ).is_ok());