Maybe relocalte the code?

Cargo.toml

@@ -100,7 +100,7 @@ members = [
 	"frame/staking",
 	"frame/staking/fuzzer",
 	"frame/staking/reward-curve",
-	"frame/election-providers",
+	"frame/two-phase-election-provider",
 	"frame/sudo",
 	"frame/support",
 	"frame/support/procedural",

bin/node/runtime/Cargo.toml

@@ -42,7 +42,6 @@ frame-executive = { version = "2.0.0", default-features = false, path = "../../.
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
 frame-support = { version = "2.0.0", default-features = false, path = "../../../frame/support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
-frame-election-providers = { version = "2.0.0", default-features = false, path = "../../../frame/election-providers/" }
 frame-system-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
 frame-system-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
 pallet-assets = { version = "2.0.0", default-features = false, path = "../../../frame/assets" }
@@ -73,6 +72,7 @@ pallet-recovery = { version = "2.0.0", default-features = false, path = "../../.
 pallet-session = { version = "2.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
 pallet-session-benchmarking = { version = "2.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
 pallet-staking = { version = "2.0.0", default-features = false, path = "../../../frame/staking" }
+pallet-two-phase-election-provider = { version = "2.0.0", default-features = false, path = "../../../frame/two-phase-election-provider/" }
 pallet-staking-reward-curve = { version = "2.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
 pallet-scheduler = { version = "2.0.0", default-features = false, path = "../../../frame/scheduler" }
 pallet-society = { version = "2.0.0", default-features = false, path = "../../../frame/society" }
@@ -143,7 +143,7 @@ std = [
 	"frame-benchmarking/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
-	"frame-election-providers/std",
+	"pallet-two-phase-election-provider/std",
 	"pallet-timestamp/std",
 	"pallet-tips/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
@@ -160,7 +160,7 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"frame-election-providers/runtime-benchmarks",
+	"pallet-two-phase-election-provider/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",

bin/node/runtime/src/lib.rs

@@ -73,7 +73,6 @@ use pallet_session::{historical as pallet_session_historical};
 use sp_inherents::{InherentData, CheckInherentsResult};
 use static_assertions::const_assert;
 use pallet_contracts::WeightInfo;
-use frame_election_providers::two_phase as pallet_two_phase_election_provider;
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;

frame/staking/Cargo.toml

@@ -39,7 +39,6 @@ sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 pallet-balances = { version = "2.0.0", path = "../balances" }
 pallet-timestamp = { version = "2.0.0", path = "../timestamp" }
-frame-election-providers = { version = "2.0.0", path = "../election-providers" }
 pallet-staking-reward-curve = { version = "2.0.0",  path = "../staking/reward-curve" }
 substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
 frame-benchmarking = { version = "2.0.0", path = "../benchmarking" }

frame/staking/src/mock.rs

@@ -36,7 +36,7 @@ use sp_runtime::{
 };
 use sp_staking::offence::{OffenceDetails, OnOffenceHandler};
 use std::{cell::RefCell, collections::HashSet};
-use frame_election_providers::onchain;
+use sp_election_providers::onchain;
 
 pub const INIT_TIMESTAMP: u64 = 30_000;
 pub const BLOCK_TIME: u64 = 1000;

frame/election-providers/Cargo.toml → frame/two-phase-election-provider/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "frame-election-providers"
+name = "pallet-two-phase-election-provider"
 version = "2.0.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
-description = "FRAME election providers"
+description = "PALLET two phase election providers"
 readme = "README.md"
 
 [package.metadata.docs.rs]

frame/election-providers/src/two_phase/benchmarking.rs → frame/two-phase-election-provider/src/benchmarking.rs

@@ -18,7 +18,7 @@
 //! Two phase election pallet benchmarking.
 
 use super::*;
-use crate::two_phase::{Module as TwoPhase};
+use crate::Module as TwoPhase;
 
 pub use frame_benchmarking::{account, benchmarks, whitelist_account, whitelisted_caller};
 use frame_support::{assert_ok, traits::OnInitialize};
@@ -311,7 +311,7 @@ benchmarks! {
 #[cfg(test)]
 mod test {
 	use super::*;
-	use crate::two_phase::mock::*;
+	use crate::mock::*;
 
 	#[test]
 	fn test_benchmarks() {

frame/election-providers/src/two_phase/mod.rs → frame/two-phase-election-provider/src/lib.rs

@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,10 +36,9 @@
 //! ```
 //!
 //! Note that the unsigned phase starts [`pallet::Config::UnsignedPhase`] blocks before the
-//! `next_election_prediction`, but only ends when a call to
-//! [`pallet::Config::ElectionProvider::elect`] happens.
+//! `next_election_prediction`, but only ends when a call to [`ElectionProvider::elect`] happens.
 //!
-//! > Given this, it is rather important for the user of this pallet to ensure it alwasy terminates
+//! > Given this, it is rather important for the user of this pallet to ensure it always terminates
 //! election via `elect` before requesting a new one.
 //!
 //! Each of the phases can be disabled by essentially setting their length to zero. If both phases
@@ -120,7 +119,7 @@
 //!
 //! 0. **all** of the used indices must be correct.
 //! 1. present *exactly* correct number of winners.
-//! 2. any assignment is checked to match with [`Snapshot::voters`].
+//! 2. any assignment is checked to match with [`RoundSnapshot::voters`].
 //! 3. the claimed score is valid, based on the fixed point arithmetic accuracy.
 //!
 //! ## Accuracy
@@ -163,14 +162,15 @@
 //!
 //! **Recursive Fallback**: Currently, the fallback is a separate enum. A different and fancier way
 //! of doing this would be to have the fallback be another
-//! [`sp_election_provider::ElectionProvider`]. In this case, this pallet can even have the on-chain
+//! [`sp_election_providers::ElectionProvider`]. In this case, this pallet can even have the on-chain
 //! election provider as fallback, or special _noop_ fallback that simply returns an error, thus
 //! replicating [`FallbackStrategy::Nothing`].
 //!
 //! **Score based on size**: We should always prioritize small solutions over bigger ones, if there
 //! is a tie. Even more harsh should be to enforce the bound of the `reduce` algorithm.
 
-use crate::onchain::OnChainSequentialPhragmen;
+#![cfg_attr(not(feature = "std"), no_std)]
+
 use codec::{Decode, Encode, HasCompact};
 use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
@@ -179,7 +179,7 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::{ensure_none, ensure_signed, offchain::SendTransactionTypes};
-use sp_election_providers::{ElectionDataProvider, ElectionProvider};
+use sp_election_providers::{ElectionDataProvider, ElectionProvider, onchain};
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, is_score_better, CompactSolution, ElectionScore,
 	EvaluateSupport, ExtendedBalance, PerThing128, Supports, VoteWeight,
@@ -191,7 +191,7 @@ use sp_runtime::{
 	},
 	DispatchError, InnerOf, PerThing, Perbill, RuntimeDebug, SaturatedConversion,
 };
-use sp_std::{convert::TryInto, prelude::*};
+use sp_std::prelude::*;
 use sp_arithmetic::{
 	UpperOf,
 	traits::{Zero, CheckedAdd},
@@ -204,6 +204,14 @@ mod mock;
 #[macro_use]
 pub(crate) mod macros;
 
+const LOG_TARGET: &'static str = "election-provider";
+
+// for the helper macros
+#[doc(hidden)]
+pub use sp_runtime::traits::UniqueSaturatedInto;
+#[doc(hidden)]
+pub use sp_std::convert::TryInto;
+
 pub mod signed;
 pub mod unsigned;
 pub mod weights;
@@ -236,7 +244,7 @@ struct OnChainConfig<T: Config>(sp_std::marker::PhantomData<T>)
 where
 	ExtendedBalance: From<InnerOf<CompactAccuracyOf<T>>>,
 	ExtendedBalance: From<InnerOf<OnChainAccuracyOf<T>>>;
-impl<T: Config> crate::onchain::Config for OnChainConfig<T>
+impl<T: Config> onchain::Config for OnChainConfig<T>
 where
 	ExtendedBalance: From<InnerOf<CompactAccuracyOf<T>>>,
 	ExtendedBalance: From<InnerOf<OnChainAccuracyOf<T>>>,
@@ -429,7 +437,7 @@ pub enum ElectionError {
 	/// A feasibility error.
 	Feasibility(FeasibilityError),
 	/// An error in the on-chain fallback.
-	OnChainFallback(crate::onchain::Error),
+	OnChainFallback(onchain::Error),
 	/// No fallback is configured
 	NoFallbackConfigured,
 	/// An internal error in the NPoS elections crate.
@@ -442,8 +450,8 @@ pub enum ElectionError {
 	PoolSubmissionFailed,
 }
 
-impl From<crate::onchain::Error> for ElectionError {
-	fn from(e: crate::onchain::Error) -> Self {
+impl From<onchain::Error> for ElectionError {
+	fn from(e: onchain::Error) -> Self {
 		ElectionError::OnChainFallback(e)
 	}
 }
@@ -726,7 +734,7 @@ pub mod pallet {
 
 		/// Submit a solution for the unsigned phase.
 		///
-		/// The dispatch origin fo this call must be __signed__.
+		/// The dispatch origin fo this call must be __none__.
 		///
 		/// This submission is checked on the fly, thus it is likely yo be more limited and smaller.
 		/// Moreover, this unsigned solution is only validated when submitted to the pool from the
@@ -848,23 +856,18 @@ pub mod pallet {
 						log!(error, "unsigned transaction validation failed due to {:?}", err);
 						err
 					})
-					.map_err(dispatch_error_to_invalid)
-					.map(Into::into)?;
+					.map_err(dispatch_error_to_invalid)?;
 
 				ValidTransaction::with_tag_prefix("OffchainElection")
 					// The higher the score[0], the better a solution is.
 					.priority(
-						T::UnsignedPriority::get()
-							.saturating_add(solution.score[0].saturated_into()),
+						T::UnsignedPriority::get().saturating_add(solution.score[0].saturated_into()),
 					)
 					// used to deduplicate unsigned solutions: each validator should produce one
 					// solution per round at most, and solutions are not propagate.
 					.and_provides(solution.round)
 					// transaction should stay in the pool for the duration of the unsigned phase.
-					.longevity(
-						TryInto::<u64>::try_into(T::UnsignedPhase::get())
-							.unwrap_or(crate::two_phase::unsigned::DEFAULT_LONGEVITY),
-					)
+					.longevity(T::UnsignedPhase::get().saturated_into::<u64>())
 					// We don't propagate this. This can never the validated at a remote node.
 					.propagate(false)
 					.build()
@@ -949,7 +952,7 @@ where
 	ExtendedBalance: From<InnerOf<CompactAccuracyOf<T>>>,
 	ExtendedBalance: From<InnerOf<OnChainAccuracyOf<T>>>,
 {
-	/// Logic for [`Pallet::on_initialize`] when signed phase is being opened.
+	/// Logic for `<Pallet as Hooks>::on_initialize` when signed phase is being opened.
 	///
 	/// This is decoupled for easy weight calculation.
 	pub fn on_initialize_open_signed() {
@@ -958,7 +961,7 @@ where
 		Self::deposit_event(Event::SignedPhaseStarted(Self::round()));
 	}
 
-	/// Logic for [`Pallet::on_initialize`] when unsigned phase is being opened.
+	/// Logic for `<Pallet as Hooks<T>>::on_initialize` when unsigned phase is being opened.
 	///
 	/// This is decoupled for easy weight calculation. Note that the default weight benchmark of
 	/// this function will assume an empty signed queue for `finalize_signed_phase`.
@@ -1147,7 +1150,7 @@ where
 	where
 		ExtendedBalance: From<<T::OnChainAccuracy as PerThing>::Inner>,
 	{
-		<OnChainSequentialPhragmen<OnChainConfig<T>> as ElectionProvider<
+		<onchain::OnChainSequentialPhragmen<OnChainConfig<T>> as ElectionProvider<
 			T::AccountId,
 			T::BlockNumber,
 		>>::elect()

frame/election-providers/src/two_phase/macros.rs → frame/two-phase-election-provider/src/macros.rs

@@ -30,32 +30,32 @@ macro_rules! log {
 #[macro_export]
 macro_rules! voter_index_fn {
 	($voters:ident, $acc:ty, $t:ident) => {
-		|who: &$acc| -> Option<$crate::two_phase::CompactVoterIndexOf<$t>> {
+		|who: &$acc| -> Option<$crate::CompactVoterIndexOf<$t>> {
 			$voters
 				.iter()
 				.position(|(x, _, _)| x == who)
-				.and_then(|i| <usize as $crate::TryInto<$crate::two_phase::CompactVoterIndexOf<$t>>>::try_into(i).ok())
+				.and_then(|i| <usize as $crate::TryInto<$crate::CompactVoterIndexOf<$t>>>::try_into(i).ok())
 			}
 	};
 }
 
 #[macro_export]
 macro_rules! target_index_fn {
 	($targets:ident, $acc:ty, $t:ident) => {
-		|who: &$acc| -> Option<$crate::two_phase::CompactTargetIndexOf<$t>> {
+		|who: &$acc| -> Option<$crate::CompactTargetIndexOf<$t>> {
 			$targets
 				.iter()
 				.position(|x| x == who)
-				.and_then(|i| <usize as $crate::TryInto<$crate::two_phase::CompactTargetIndexOf<$t>>>::try_into(i).ok())
+				.and_then(|i| <usize as $crate::TryInto<$crate::CompactTargetIndexOf<$t>>>::try_into(i).ok())
 			}
 	};
 }
 
 #[macro_export]
 macro_rules! voter_at_fn {
 	($snap:ident, $acc:ty, $t:ident) => {
-		|i: $crate::two_phase::CompactVoterIndexOf<$t>| -> Option<$acc> {
-							<$crate::two_phase::CompactVoterIndexOf<$t> as $crate::TryInto<usize>>::try_into(i)
+		|i: $crate::CompactVoterIndexOf<$t>| -> Option<$acc> {
+							<$crate::CompactVoterIndexOf<$t> as $crate::TryInto<usize>>::try_into(i)
 								.ok()
 								.and_then(|i| $snap
 									.get(i)
@@ -69,8 +69,8 @@ macro_rules! voter_at_fn {
 #[macro_export]
 macro_rules! target_at_fn {
 	($snap:ident, $acc:ty, $t:ident) => {
-		|i: $crate::two_phase::CompactTargetIndexOf<$t>| -> Option<$acc> {
-							<$crate::two_phase::CompactTargetIndexOf<$t> as $crate::TryInto<usize>>::try_into(i)
+		|i: $crate::CompactTargetIndexOf<$t>| -> Option<$acc> {
+							<$crate::CompactTargetIndexOf<$t> as $crate::TryInto<usize>>::try_into(i)
 								.ok()
 								.and_then(|i| $snap
 									.get(i)