Replaced NoFallback with OnChainFallback (#285)

capsule-corp-ternoa · Sep 27, 2022 · 63e4f71 · 63e4f71
1 parent 99c3f44
commit 63e4f71
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/runtime/alphanet/Cargo.toml b/runtime/alphanet/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "alphanet-runtime"
 authors = [ "Ternoa" ]
-version = "1.2.1"
+version = "1.2.2"
 edition = "2021"
 build = "build.rs"
 

diff --git a/runtime/alphanet/src/pallets.rs b/runtime/alphanet/src/pallets.rs
@@ -408,7 +408,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type OffchainRepeat = OffchainRepeat;
 	type MinerTxPriority = common::election_provider_multi_phase::NposSolutionPriority;
 	type DataProvider = Staking;
-	type Fallback = common::election_provider_multi_phase::Fallback<Self>;
+	type Fallback = frame_election_provider_support::onchain::UnboundedExecution<OnChainSeqPhragmen>;
 	type GovernanceFallback =
 		frame_election_provider_support::onchain::UnboundedExecution<OnChainSeqPhragmen>;
 	type Solver = common::election_provider_multi_phase::Solver<Self>;

diff --git a/runtime/alphanet/src/version.rs b/runtime/alphanet/src/version.rs
@@ -44,7 +44,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	/// Version of the runtime specification. A full-node will not attempt to use its native
 	/// runtime in substitute for the on-chain Wasm runtime unless all of `spec_name`,
 	/// `spec_version` and `authoring_version` are the same between Wasm and native.
-	spec_version: 7,
+	spec_version: 8,
 
 	/// Version of the implementation of the specification. Nodes are free to ignore this; it
 	/// serves only as an indication that the code is different; as long as the other two versions

diff --git a/runtime/common/src/election_provider_multi_phase.rs b/runtime/common/src/election_provider_multi_phase.rs
@@ -96,7 +96,6 @@ impl pallet_election_provider_multi_phase::BenchmarkingConfig for BenchmarkConfi
 	const MAXIMUM_TARGETS: u32 = 300;
 }
 
-pub type Fallback<R> = pallet_election_provider_multi_phase::NoFallback<R>;
 pub type Solver<R> = frame_election_provider_support::SequentialPhragmen<
 	AccountId,
 	pallet_election_provider_multi_phase::SolutionAccuracyOf<R>,

diff --git a/runtime/mainnet/Cargo.toml b/runtime/mainnet/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mainnet-runtime"
 authors = [ "Ternoa" ]
-version = "1.2.1"
+version = "1.2.2"
 edition = "2021"
 build = "build.rs"
 

diff --git a/runtime/mainnet/src/pallets.rs b/runtime/mainnet/src/pallets.rs
@@ -408,7 +408,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type OffchainRepeat = OffchainRepeat;
 	type MinerTxPriority = common::election_provider_multi_phase::NposSolutionPriority;
 	type DataProvider = Staking;
-	type Fallback = common::election_provider_multi_phase::Fallback<Self>;
+	type Fallback = frame_election_provider_support::onchain::UnboundedExecution<OnChainSeqPhragmen>;
 	type GovernanceFallback =
 		frame_election_provider_support::onchain::UnboundedExecution<OnChainSeqPhragmen>;
 	type Solver = common::election_provider_multi_phase::Solver<Self>;

diff --git a/runtime/mainnet/src/version.rs b/runtime/mainnet/src/version.rs
@@ -44,7 +44,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	/// Version of the runtime specification. A full-node will not attempt to use its native
 	/// runtime in substitute for the on-chain Wasm runtime unless all of `spec_name`,
 	/// `spec_version` and `authoring_version` are the same between Wasm and native.
-	spec_version: 7,
+	spec_version: 8,
 
 	/// Version of the implementation of the specification. Nodes are free to ignore this; it
 	/// serves only as an indication that the code is different; as long as the other two versions