pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-09 20:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix phragmen election to wasm (#3898)

Browse Source 
* Fix phragmen-election compile to wasm

* Fix chain_spec stuff

* Fix panic with no term duration
This commit is contained in:
Kian Paimani
2019-10-23 22:04:42 +02:00
committed by Gavin Wood
parent d82216673c
commit 311be1d071
7 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/Cargo.lock
Generated
+1 -1
View File
@@ -2484,7 +2484,7 @@ dependencies = [
"srml-contracts 2.0.0",
"srml-contracts-rpc-runtime-api 2.0.0",
"srml-democracy 2.0.0",
"srml-elections 2.0.0",
"srml-elections-phragmen 2.0.0",
"srml-executive 2.0.0",
"srml-finality-tracker 2.0.0",
"srml-grandpa 2.0.0",
substrate/node/cli/src/chain_spec.rs
+4 -4
View File
@@ -235,11 +235,11 @@ pub fn testnet_genesis(
members: vec![],
phantom: Default::default(),
}),
elections: Some(ElectionsConfig {
members: vec![],
presentation_duration: 1 * DAYS,
elections_phragmen: Some(ElectionsConfig {
members: endowed_accounts.iter().take(2).cloned().collect(),
term_duration: 28 * DAYS,
desired_seats: 0,
desired_members: 4,
desired_runners_up: 1,
}),
contracts: Some(ContractsConfig {
current_schedule: contracts::Schedule {
substrate/node/primitives/src/lib.rs
+1 -4
View File
@@ -60,9 +60,6 @@ pub type DigestItem = generic::DigestItem<Hash>;
/// Header type.
pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
/// Block type.
pub type Block = generic::Block<Header, UncheckedExtrinsic>;
pub type Block = generic::Block<Header, OpaqueExtrinsic>;
/// Block ID.
pub type BlockId = generic::BlockId<Block>;
/// Opaque, encoded, unchecked extrinsic.
pub type UncheckedExtrinsic = OpaqueExtrinsic;
substrate/node/runtime/Cargo.toml
+2 -2
View File
@@ -33,7 +33,7 @@ collective = { package = "srml-collective", path = "../../srml/collective", defa
contracts = { package = "srml-contracts", path = "../../srml/contracts", default-features = false }
contracts-rpc-runtime-api = { package = "srml-contracts-rpc-runtime-api", path = "../../srml/contracts/rpc/runtime-api/", default-features = false }
democracy = { package = "srml-democracy", path = "../../srml/democracy", default-features = false }
elections = { package = "srml-elections", path = "../../srml/elections", default-features = false }
elections-phragmen = { package = "srml-elections-phragmen", path = "../../srml/elections-phragmen", default-features = false }
executive = { package = "srml-executive", path = "../../srml/executive", default-features = false }
finality-tracker = { package = "srml-finality-tracker", path = "../../srml/finality-tracker", default-features = false }
grandpa = { package = "srml-grandpa", path = "../../srml/grandpa", default-features = false }
@@ -72,7 +72,7 @@ std = [
"contracts/std",
"contracts-rpc-runtime-api/std",
"democracy/std",
"elections/std",
"elections-phragmen/std",
"executive/std",
"finality-tracker/std",
"grandpa/std",
substrate/node/runtime/src/lib.rs
+9 -25
View File
@@ -45,7 +45,6 @@ use sr_primitives::traits::{
self, BlakeTwo256, Block as BlockT, NumberFor, StaticLookup, SaturatedConversion,
};
use version::RuntimeVersion;
use elections::VoteIndex;
#[cfg(any(feature = "std", test))]
use version::NativeVersion;
use primitives::OpaqueMetadata;
@@ -84,8 +83,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// and set impl_version to equal spec_version. If only runtime
// implementation changes and behavior does not, then leave spec_version as
// is and increment impl_version.
spec_version: 181,
impl_version: 183,
spec_version: 182,
impl_version: 182,
apis: RUNTIME_API_VERSIONS,
};
@@ -324,33 +323,18 @@ impl collective::Trait<CouncilCollective> for Runtime {
parameter_types! {
pub const CandidacyBond: Balance = 10 * DOLLARS;
pub const VotingBond: Balance = 1 * DOLLARS;
pub const VotingFee: Balance = 2 * DOLLARS;
pub const MinimumVotingLock: Balance = 1 * DOLLARS;
pub const PresentSlashPerVoter: Balance = 1 * CENTS;
pub const CarryCount: u32 = 6;
// one additional vote should go by before an inactive voter can be reaped.
pub const InactiveGracePeriod: VoteIndex = 1;
pub const ElectionsVotingPeriod: BlockNumber = 2 * DAYS;
pub const DecayRatio: u32 = 0;
}
impl elections::Trait for Runtime {
impl elections_phragmen::Trait for Runtime {
type Event = Event;
type Currency = Balances;
type BadPresentation = ();
type BadReaper = ();
type BadVoterIndex = ();
type LoserCandidate = ();
type ChangeMembers = Council;
type CurrencyToVote = CurrencyToVoteHandler;
type CandidacyBond = CandidacyBond;
type VotingBond = VotingBond;
type VotingFee = VotingFee;
type MinimumVotingLock = MinimumVotingLock;
type PresentSlashPerVoter = PresentSlashPerVoter;
type CarryCount = CarryCount;
type InactiveGracePeriod = InactiveGracePeriod;
type VotingPeriod = ElectionsVotingPeriod;
type DecayRatio = DecayRatio;
type LoserCandidate = ();
type BadReport = ();
type KickedMember = ();
type ChangeMembers = Council;
}
type TechnicalCollective = collective::Instance2;
@@ -518,7 +502,7 @@ construct_runtime!(
Democracy: democracy::{Module, Call, Storage, Config, Event<T>},
Council: collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
TechnicalCommittee: collective::<Instance2>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
Elections: elections::{Module, Call, Storage, Event<T>, Config<T>},
Elections: elections_phragmen::{Module, Call, Storage, Event<T>, Config<T>},
TechnicalMembership: membership::<Instance1>::{Module, Call, Storage, Event<T>, Config<T>},
FinalityTracker: finality_tracker::{Module, Call, Inherent},
Grandpa: grandpa::{Module, Call, Storage, Config, Event},
substrate/node/testing/src/genesis.rs
+1 -1
View File
@@ -94,7 +94,7 @@ pub fn config(support_changes_trie: bool, code: Option<&[u8]>) -> GenesisConfig
collective_Instance1: Some(Default::default()),
collective_Instance2: Some(Default::default()),
membership_Instance1: Some(Default::default()),
elections: Some(Default::default()),
elections_phragmen: Some(Default::default()),
sudo: Some(Default::default()),
}
}
substrate/srml/elections-phragmen/src/lib.rs
+48 -5
View File
@@ -76,6 +76,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
use rstd::prelude::*;
use sr_primitives::{print, traits::{Zero, StaticLookup, Bounded, Convert}};
use sr_primitives::weights::SimpleDispatchInfo;
use srml_support::{
@@ -136,7 +137,8 @@ decl_storage! {
/// Number of runners_up to keep.
pub DesiredRunnersUp get(fn desired_runners_up) config(): u32;
/// How long each seat is kept. This defines the next block number at which an election
/// round will happen.
/// round will happen. If set to zero, no elections are ever triggered and the module will
/// be in passive mode. In that case only a member set defined in at genesis can exist.
pub TermDuration get(fn term_duration) config(): T::BlockNumber;
// ---- State
@@ -470,8 +472,10 @@ impl<T: Trait> Module<T> {
/// Runs phragmen election and cleans all the previous candidate state. The voter state is NOT
/// cleaned and voters must themselves submit a transaction to retract.
fn end_block(block_number: T::BlockNumber) -> dispatch::Result {
if (block_number % Self::term_duration()).is_zero() {
Self::do_phragmen();
if !Self::term_duration().is_zero() {
if (block_number % Self::term_duration()).is_zero() {
Self::do_phragmen();
}
}
Ok(())
}
@@ -701,7 +705,9 @@ mod tests {
pub struct ExtBuilder {
balance_factor: u64,
voter_bond: u64,
term_duration: u64,
desired_runners_up: u32,
members: Vec<u64>,
}
impl Default for ExtBuilder {
@@ -710,6 +716,8 @@ mod tests {
balance_factor: 1,
voter_bond: 2,
desired_runners_up: 0,
term_duration: 5,
members: vec![],
}
}
}
@@ -723,6 +731,14 @@ mod tests {
self.desired_runners_up = count;
self
}
pub fn term_duration(mut self, duration: u64) -> Self {
self.term_duration = duration;
self
}
pub fn members(mut self, members: Vec<u64>) -> Self {
self.members = members;
self
}
pub fn build(self) -> runtime_io::TestExternalities {
VOTING_BOND.with(|v| *v.borrow_mut() = self.voter_bond);
GenesisConfig {
@@ -738,10 +754,10 @@ mod tests {
vesting: vec![],
}),
elections: Some(elections::GenesisConfig::<Test>{
members: vec![],
members: self.members,
desired_members: 2,
desired_runners_up: self.desired_runners_up,
term_duration: 5,
term_duration: self.term_duration,
}),
}.build_storage().unwrap().into()
}
@@ -781,6 +797,33 @@ mod tests {
});
}
#[test]
fn passive_module_should_work() {
ExtBuilder::default()
.term_duration(0)
.members(vec![1, 2, 3])
.build()
.execute_with(||
{
System::set_block_number(1);
assert_eq!(Elections::term_duration(), 0);
assert_eq!(Elections::desired_members(), 2);
assert_eq!(Elections::election_rounds(), 0);
assert_eq!(Elections::members(), vec![1, 2, 3]);
assert_eq!(Elections::runners_up(), vec![]);
assert_eq!(Elections::candidates(), vec![]);
assert_eq!(all_voters(), vec![]);
System::set_block_number(5);
assert_ok!(Elections::end_block(System::block_number()));
assert_eq!(Elections::members(), vec![1, 2, 3]);
assert_eq!(Elections::runners_up(), vec![]);
});
}
#[test]
fn simple_candidate_submission_should_work() {
ExtBuilder::default().build().execute_with(|| {