This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
Governance: Voters put money where mouth is #1183
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -122,6 +122,8 @@ decl_storage! { | |
| trait Store for Module<T: Trait> as CouncilVoting { | ||
| pub CooloffPeriod get(cooloff_period) config(): T::BlockNumber = T::BlockNumber::sa(1000); | ||
| pub VotingPeriod get(voting_period) config(): T::BlockNumber = T::BlockNumber::sa(3); | ||
| /// Number of blocks by which to delay enactment of successful, non-unanimous-council-instigated referendum proposals. | ||
| pub EnactDelayPeriod get(enact_delay_period) config(): T::BlockNumber = T::BlockNumber::sa(0); | ||
| pub Proposals get(proposals) build(|_| vec![0u8; 0]): Vec<(T::BlockNumber, T::Hash)>; // ordered by expiry. | ||
| pub ProposalOf get(proposal_of): map T::Hash => Option<T::Proposal>; | ||
| pub ProposalVoters get(proposal_voters): map T::Hash => Vec<T::AccountId>; | ||
|
|
@@ -215,10 +217,18 @@ impl<T: Trait> Module<T> { | |
| Self::deposit_event(RawEvent::TallyReferendum(proposal_hash.clone(), tally.0, tally.1, tally.2)); | ||
| if tally.0 > tally.1 + tally.2 { | ||
| Self::kill_veto_of(&proposal_hash); | ||
| // If there were no nay-votes from the council, then it's weakly uncontroversial; we enact immediately. | ||
| let period = match tally.1 { | ||
| 0 => Zero::zero(), | ||
| _ => Self::enact_delay_period(), | ||
| }; | ||
| // If all council members voted yes, then it's strongly unconversial; we require a negative | ||
| // super-majority at referendum in order to defeat it. | ||
| let threshold = match tally { | ||
| (_, 0, 0) => democracy::VoteThreshold::SuperMajorityAgainst, | ||
| _ => democracy::VoteThreshold::SimpleMajority, | ||
| }; | ||
| <democracy::Module<T>>::internal_start_referendum(proposal, threshold, period).map(|_| ())?; | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -267,8 +277,8 @@ mod tests { | |
| with_externalities(&mut new_test_ext(true), || { | ||
| System::set_block_number(1); | ||
| let proposal = set_balance_proposal(42); | ||
| assert_ok!(Democracy::internal_start_referendum(proposal.clone(), VoteThreshold::SuperMajorityApprove, 0), 0); | ||
| assert_eq!(Democracy::active_referendums(), vec![(0, 4, proposal, VoteThreshold::SuperMajorityApprove, 0)]); | ||
|
There was a problem hiding this comment. would there be any benefit to using There was a problem hiding this comment. not within tests, where the type is concrete. |
||
|
|
||
| let cancellation = cancel_referendum_proposal(0); | ||
| let hash = cancellation.blake2_256().into(); | ||
|
|
@@ -290,7 +300,7 @@ mod tests { | |
| with_externalities(&mut new_test_ext(true), || { | ||
| System::set_block_number(1); | ||
| let proposal = set_balance_proposal(42); | ||
| assert_ok!(Democracy::internal_start_referendum(proposal.clone(), VoteThreshold::SuperMajorityApprove, 0), 0); | ||
|
|
||
| let cancellation = cancel_referendum_proposal(0); | ||
| let hash = cancellation.blake2_256().into(); | ||
|
|
@@ -301,7 +311,7 @@ mod tests { | |
|
|
||
| System::set_block_number(2); | ||
| assert_ok!(CouncilVoting::end_block(System::block_number())); | ||
| assert_eq!(Democracy::active_referendums(), vec![(0, 4, proposal, VoteThreshold::SuperMajorityApprove, 0)]); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -310,7 +320,7 @@ mod tests { | |
| with_externalities(&mut new_test_ext(true), || { | ||
| System::set_block_number(1); | ||
| let proposal = set_balance_proposal(42); | ||
| assert_ok!(Democracy::internal_start_referendum(proposal.clone(), VoteThreshold::SuperMajorityApprove, 0), 0); | ||
|
|
||
| let cancellation = cancel_referendum_proposal(0); | ||
| let hash = cancellation.blake2_256().into(); | ||
|
|
@@ -320,7 +330,7 @@ mod tests { | |
|
|
||
| System::set_block_number(2); | ||
| assert_ok!(CouncilVoting::end_block(System::block_number())); | ||
| assert_eq!(Democracy::active_referendums(), vec![(0, 4, proposal, VoteThreshold::SuperMajorityApprove, 0)]); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -384,7 +394,7 @@ mod tests { | |
| System::set_block_number(4); | ||
| assert_ok!(CouncilVoting::end_block(System::block_number())); | ||
| assert_eq!(CouncilVoting::proposals().len(), 0); | ||
| assert_eq!(Democracy::active_referendums(), vec![(0, 7, set_balance_proposal(42), VoteThreshold::SimpleMajority, 0)]); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -449,7 +459,7 @@ mod tests { | |
| System::set_block_number(2); | ||
| assert_ok!(CouncilVoting::end_block(System::block_number())); | ||
| assert_eq!(CouncilVoting::proposals().len(), 0); | ||
| assert_eq!(Democracy::active_referendums(), vec![(0, 5, proposal, VoteThreshold::SuperMajorityAgainst, 0)]); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -467,7 +477,7 @@ mod tests { | |
| System::set_block_number(2); | ||
| assert_ok!(CouncilVoting::end_block(System::block_number())); | ||
| assert_eq!(CouncilVoting::proposals().len(), 0); | ||
| assert_eq!(Democracy::active_referendums(), vec![(0, 5, proposal, VoteThreshold::SimpleMajority, 0)]); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(nitpick) typo
uncontroversial