Fix merge issues in babe-client

client/consensus/babe/src/authorship.rs

@@ -172,14 +172,14 @@ pub fn claim_slot(
 ) -> Option<(PreDigest, AuthorityPair)> {
 	claim_primary_slot(slot_number, epoch, epoch.config.c, keystore)
 		.or_else(|| {
-			if config.allowed_slots.is_secondary_plain_slots_allowed() ||
-				config.allowed_slots.is_secondary_vrf_slots_allowed()
+			if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() ||
+				epoch.config.allowed_slots.is_secondary_vrf_slots_allowed()
 			{
 				claim_secondary_slot(
 					slot_number,
 					&epoch,
 					keystore,
-					config.allowed_slots.is_secondary_vrf_slots_allowed(),
+					epoch.config.allowed_slots.is_secondary_vrf_slots_allowed(),
 				)
 			} else {
 				None

client/consensus/babe/src/aux_schema.rs

@@ -136,12 +136,12 @@ pub(crate) fn load_block_weight<H: Encode, B: AuxStore>(
 #[cfg(test)]
 mod test {
 	use super::*;
-	use crate::{Epoch, migration::EpochV0};
+	use crate::migration::EpochV0;
 	use fork_tree::ForkTree;
 	use substrate_test_runtime_client;
 	use sp_core::H256;
 	use sp_runtime::traits::NumberFor;
-	use sp_consensus_babe::{BabeEpochConfiguration, BabeGenesisConfiguration};
+	use sp_consensus_babe::{AllowedSlots, BabeGenesisConfiguration};
 	use sc_consensus_epochs::{PersistedEpoch, PersistedEpochHeader, EpochHeader};
 	use sp_consensus::Error as ConsensusError;
 	use sc_network_test::Block as TestBlock;
@@ -182,7 +182,7 @@ mod test {
 				c: (3, 10),
 				genesis_authorities: Vec::new(),
 				randomness: Default::default(),
-				secondary_slots: true,
+				allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
 			},
 		).unwrap();
 

client/consensus/babe/src/lib.rs

@@ -189,7 +189,7 @@ impl Epoch {
 			randomness: genesis_config.randomness.clone(),
 			config: BabeEpochConfiguration {
 				c: genesis_config.c,
-				secondary_slots: genesis_config.secondary_slots,
+				allowed_slots: genesis_config.allowed_slots,
 			},
 		}
 	}

client/consensus/babe/src/migration.rs

@@ -57,7 +57,7 @@ impl EpochV0 {
 			randomness: self.randomness,
 			config: BabeEpochConfiguration {
 				c: config.c,
-				secondary_slots: config.secondary_slots,
+				allowed_slots: config.allowed_slots,
 			},
 		}
 	}

client/consensus/babe/src/tests.rs

@@ -507,7 +507,7 @@ fn can_author_block() {
 		duration: 100,
 		config: BabeEpochConfiguration {
 			c: (3, 10),
-			secondary_slots: true,
+			allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
 		},
 	};
 

client/consensus/babe/src/verification.rs

@@ -103,7 +103,7 @@ pub(super) fn check_header<B: BlockT + Sized>(
 				epoch.config.c,
 			)?;
 		},
-		PreDigest::SecondaryPlain(secondary) if config.allowed_slots.is_secondary_plain_slots_allowed() => {
+		PreDigest::SecondaryPlain(secondary) if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() => {
 			debug!(target: "babe", "Verifying Secondary plain block");
 			check_secondary_plain_header::<B>(
 				pre_hash,
@@ -112,7 +112,7 @@ pub(super) fn check_header<B: BlockT + Sized>(
 				&epoch,
 			)?;
 		},
-		PreDigest::SecondaryVRF(secondary) if config.allowed_slots.is_secondary_vrf_slots_allowed() => {
+		PreDigest::SecondaryVRF(secondary) if epoch.config.allowed_slots.is_secondary_vrf_slots_allowed() => {
 			debug!(target: "babe", "Verifying Secondary VRF block");
 			check_secondary_vrf_header::<B>(
 				pre_hash,

primitives/consensus/babe/src/lib.rs

@@ -184,7 +184,7 @@ pub enum AllowedSlots {
 
 impl AllowedSlots {
 	/// Whether plain secondary slots are allowed.
-	pub fn is_secondary_slots_allowed(&self) -> bool {
+	pub fn is_secondary_plain_slots_allowed(&self) -> bool {
 		*self == Self::PrimaryAndSecondaryPlainSlots
 	}