Unverified Commit cf1338c1 authored by Peter Goodspeed-Niklaus's avatar Peter Goodspeed-Niklaus Committed by GitHub
Browse files

Companion for Multi-phase elections solution resubmission (#2648)

* Companion for Multi-phase elections solution resubmission

https://github.com/paritytech/substrate/pull/8290

* update Substrate

Co-authored-by: parity-processbot <>
parent 735aa24b
Pipeline #136604 passed with stages
in 39 minutes and 8 seconds
This diff is collapsed.
...@@ -346,6 +346,7 @@ parameter_types! { ...@@ -346,6 +346,7 @@ parameter_types! {
// miner configs // miner configs
pub const MinerMaxIterations: u32 = 10; pub const MinerMaxIterations: u32 = 10;
pub OffchainRepeat: BlockNumber = 5;
} }
sp_npos_elections::generate_solution_type!( sp_npos_elections::generate_solution_type!(
...@@ -364,8 +365,9 @@ impl pallet_election_provider_multi_phase::Config for Runtime { ...@@ -364,8 +365,9 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type UnsignedPhase = UnsignedPhase; type UnsignedPhase = UnsignedPhase;
type SolutionImprovementThreshold = SolutionImprovementThreshold; type SolutionImprovementThreshold = SolutionImprovementThreshold;
type MinerMaxIterations = MinerMaxIterations; type MinerMaxIterations = MinerMaxIterations;
type MinerMaxWeight = OffchainSolutionWeightLimit; type MinerMaxWeight = OffchainSolutionWeightLimit; // For now use the one from staking.
type MinerMaxLength = OffchainSolutionLengthLimit; type MinerMaxLength = OffchainSolutionLengthLimit;
type OffchainRepeat = OffchainRepeat;
type MinerTxPriority = NposSolutionPriority; type MinerTxPriority = NposSolutionPriority;
type DataProvider = Staking; type DataProvider = Staking;
type OnChainAccuracy = Perbill; type OnChainAccuracy = Perbill;
......
...@@ -331,6 +331,7 @@ parameter_types! { ...@@ -331,6 +331,7 @@ parameter_types! {
// miner configs // miner configs
pub const MinerMaxIterations: u32 = 10; pub const MinerMaxIterations: u32 = 10;
pub OffchainRepeat: BlockNumber = 5;
} }
sp_npos_elections::generate_solution_type!( sp_npos_elections::generate_solution_type!(
...@@ -349,8 +350,9 @@ impl pallet_election_provider_multi_phase::Config for Runtime { ...@@ -349,8 +350,9 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type UnsignedPhase = UnsignedPhase; type UnsignedPhase = UnsignedPhase;
type SolutionImprovementThreshold = SolutionImprovementThreshold; type SolutionImprovementThreshold = SolutionImprovementThreshold;
type MinerMaxIterations = MinerMaxIterations; type MinerMaxIterations = MinerMaxIterations;
type MinerMaxWeight = OffchainSolutionWeightLimit; type MinerMaxWeight = OffchainSolutionWeightLimit; // For now use the one from staking.
type MinerMaxLength = OffchainSolutionLengthLimit; type MinerMaxLength = OffchainSolutionLengthLimit;
type OffchainRepeat = OffchainRepeat;
type MinerTxPriority = NposSolutionPriority; type MinerTxPriority = NposSolutionPriority;
type DataProvider = Staking; type DataProvider = Staking;
type OnChainAccuracy = Perbill; type OnChainAccuracy = Perbill;
......
...@@ -343,6 +343,7 @@ parameter_types! { ...@@ -343,6 +343,7 @@ parameter_types! {
// miner configs // miner configs
pub const MinerMaxIterations: u32 = 10; pub const MinerMaxIterations: u32 = 10;
pub OffchainRepeat: BlockNumber = 5;
} }
sp_npos_elections::generate_solution_type!( sp_npos_elections::generate_solution_type!(
...@@ -361,8 +362,9 @@ impl pallet_election_provider_multi_phase::Config for Runtime { ...@@ -361,8 +362,9 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
type UnsignedPhase = UnsignedPhase; type UnsignedPhase = UnsignedPhase;
type SolutionImprovementThreshold = SolutionImprovementThreshold; type SolutionImprovementThreshold = SolutionImprovementThreshold;
type MinerMaxIterations = MinerMaxIterations; type MinerMaxIterations = MinerMaxIterations;
type MinerMaxWeight = OffchainSolutionWeightLimit; type MinerMaxWeight = OffchainSolutionWeightLimit; // For now use the one from staking.
type MinerMaxLength = OffchainSolutionLengthLimit; type MinerMaxLength = OffchainSolutionLengthLimit;
type OffchainRepeat = OffchainRepeat;
type MinerTxPriority = NposSolutionPriority; type MinerTxPriority = NposSolutionPriority;
type DataProvider = Staking; type DataProvider = Staking;
type OnChainAccuracy = Perbill; type OnChainAccuracy = Perbill;
......
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