Several tweaks needed for Governance 2.0

bin/node/runtime/src/lib.rs

@@ -31,7 +31,7 @@ use frame_support::{
 	pallet_prelude::Get,
 	parameter_types,
 	traits::{
-		AsEnsureOriginWithArg, ConstU128, ConstU16, ConstU32, Currency, EnsureOneOf,
+		AsEnsureOriginWithArg, ConstU128, ConstU16, ConstU32, Currency, EitherOfDiverse,
 		EqualPrivilegeOnly, Everything, Imbalance, InstanceFilter, KeyOwnerProofSystem,
 		LockIdentifier, Nothing, OnUnbalanced, U128CurrencyToVote,
 	},
@@ -550,7 +550,7 @@ impl pallet_staking::Config for Runtime {
 	type BondingDuration = BondingDuration;
 	type SlashDeferDuration = SlashDeferDuration;
 	/// A super-majority of the council can cancel the slash.
-	type SlashCancelOrigin = EnsureOneOf<
+	type SlashCancelOrigin = EitherOfDiverse<
 		EnsureRoot<AccountId>,
 		pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 3, 4>,
 	>;
@@ -794,12 +794,14 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				confirm_period: 2,
 				min_enactment_period: 4,
 				min_approval: pallet_referenda::Curve::LinearDecreasing {
-					begin: Perbill::from_percent(100),
-					delta: Perbill::from_percent(50),
+					length: Perbill::from_percent(100),
+					floor: Perbill::from_percent(50),
+					ceil: Perbill::from_percent(100),
 				},
-				min_turnout: pallet_referenda::Curve::LinearDecreasing {
-					begin: Perbill::from_percent(100),
-					delta: Perbill::from_percent(100),
+				min_support: pallet_referenda::Curve::LinearDecreasing {
+					length: Perbill::from_percent(100),
+					floor: Perbill::from_percent(0),
+					ceil: Perbill::from_percent(100),
 				},
 			},
 		)];
@@ -882,7 +884,7 @@ impl pallet_democracy::Config for Runtime {
 		pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 2, 3>;
 	// To cancel a proposal before it has been passed, the technical committee must be unanimous or
 	// Root must agree.
-	type CancelProposalOrigin = EnsureOneOf<
+	type CancelProposalOrigin = EitherOfDiverse<
 		EnsureRoot<AccountId>,
 		pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 1, 1>,
 	>;
@@ -972,7 +974,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type WeightInfo = pallet_collective::weights::SubstrateWeight<Runtime>;
 }
 
-type EnsureRootOrHalfCouncil = EnsureOneOf<
+type EnsureRootOrHalfCouncil = EitherOfDiverse<
 	EnsureRoot<AccountId>,
 	pallet_collective::EnsureProportionMoreThan<AccountId, CouncilCollective, 1, 2>,
 >;
@@ -1006,11 +1008,11 @@ parameter_types! {
 impl pallet_treasury::Config for Runtime {
 	type PalletId = TreasuryPalletId;
 	type Currency = Balances;
-	type ApproveOrigin = EnsureOneOf<
+	type ApproveOrigin = EitherOfDiverse<
 		EnsureRoot<AccountId>,
 		pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 3, 5>,
 	>;
-	type RejectOrigin = EnsureOneOf<
+	type RejectOrigin = EitherOfDiverse<
 		EnsureRoot<AccountId>,
 		pallet_collective::EnsureProportionMoreThan<AccountId, CouncilCollective, 1, 2>,
 	>;
@@ -1025,6 +1027,7 @@ impl pallet_treasury::Config for Runtime {
 	type SpendFunds = Bounties;
 	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 	type MaxApprovals = MaxApprovals;
+	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u128>;
 }
 
 parameter_types! {

docs/Upgrading-2.0-to-3.0.md

@@ -290,7 +290,7 @@ Democracy brings three new settings with this release, all to allow for better i
  	type CancellationOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>;
 +	// To cancel a proposal before it has been passed, the technical committee must be unanimous or
 +	// Root must agree.
-+	type CancelProposalOrigin = EnsureOneOf<
++	type CancelProposalOrigin = EitherOfDiverse<
 +		AccountId,
 +		EnsureRoot<AccountId>,
 +		pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCollective>,

frame/bounties/src/tests.rs

@@ -109,7 +109,6 @@ parameter_types! {
 	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 }
 
-// impl pallet_treasury::Config for Test {
 impl pallet_treasury::Config for Test {
 	type PalletId = TreasuryPalletId;
 	type Currency = pallet_balances::Pallet<Test>;
@@ -126,6 +125,7 @@ impl pallet_treasury::Config for Test {
 	type WeightInfo = ();
 	type SpendFunds = Bounties;
 	type MaxApprovals = ConstU32<100>;
+	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u64>;
 }
 
 parameter_types! {

frame/child-bounties/src/tests.rs

@@ -130,6 +130,7 @@ impl pallet_treasury::Config for Test {
 	type WeightInfo = ();
 	type SpendFunds = Bounties;
 	type MaxApprovals = ConstU32<100>;
+	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u64>;
 }
 parameter_types! {
 	// This will be 50% of the bounty fee.

frame/conviction-voting/src/tests.rs

@@ -21,7 +21,7 @@ use std::collections::BTreeMap;
 
 use frame_support::{
 	assert_noop, assert_ok, parameter_types,
-	traits::{ConstU32, ConstU64, Contains, Polling},
+	traits::{ConstU32, ConstU64, Contains, Polling, VoteTally},
 };
 use sp_core::H256;
 use sp_runtime::{
@@ -166,7 +166,7 @@ impl Polling<TallyOf<Test>> for TestPolls {
 	fn create_ongoing(class: Self::Class) -> Result<Self::Index, ()> {
 		let mut polls = Polls::get();
 		let i = polls.keys().rev().next().map_or(0, |x| x + 1);
-		polls.insert(i, Ongoing(Tally::default(), class));
+		polls.insert(i, Ongoing(Tally::new(0), class));
 		Polls::set(polls);
 		Ok(i)
 	}
@@ -271,19 +271,19 @@ fn basic_voting_works() {
 		assert_ok!(Voting::vote(Origin::signed(1), 3, aye(2, 5)));
 		assert_eq!(tally(3), Tally::from_parts(10, 0, 2));
 		assert_ok!(Voting::vote(Origin::signed(1), 3, nay(2, 5)));
-		assert_eq!(tally(3), Tally::from_parts(0, 10, 2));
+		assert_eq!(tally(3), Tally::from_parts(0, 10, 0));
 		assert_eq!(Balances::usable_balance(1), 8);
 
 		assert_ok!(Voting::vote(Origin::signed(1), 3, aye(5, 1)));
 		assert_eq!(tally(3), Tally::from_parts(5, 0, 5));
 		assert_ok!(Voting::vote(Origin::signed(1), 3, nay(5, 1)));
-		assert_eq!(tally(3), Tally::from_parts(0, 5, 5));
+		assert_eq!(tally(3), Tally::from_parts(0, 5, 0));
 		assert_eq!(Balances::usable_balance(1), 5);
 
 		assert_ok!(Voting::vote(Origin::signed(1), 3, aye(10, 0)));
 		assert_eq!(tally(3), Tally::from_parts(1, 0, 10));
 		assert_ok!(Voting::vote(Origin::signed(1), 3, nay(10, 0)));
-		assert_eq!(tally(3), Tally::from_parts(0, 1, 10));
+		assert_eq!(tally(3), Tally::from_parts(0, 1, 0));
 		assert_eq!(Balances::usable_balance(1), 0);
 
 		assert_ok!(Voting::remove_vote(Origin::signed(1), None, 3));
@@ -300,19 +300,19 @@ fn voting_balance_gets_locked() {
 		assert_ok!(Voting::vote(Origin::signed(1), 3, aye(2, 5)));
 		assert_eq!(tally(3), Tally::from_parts(10, 0, 2));
 		assert_ok!(Voting::vote(Origin::signed(1), 3, nay(2, 5)));
-		assert_eq!(tally(3), Tally::from_parts(0, 10, 2));
+		assert_eq!(tally(3), Tally::from_parts(0, 10, 0));
 		assert_eq!(Balances::usable_balance(1), 8);
 
 		assert_ok!(Voting::vote(Origin::signed(1), 3, aye(5, 1)));
 		assert_eq!(tally(3), Tally::from_parts(5, 0, 5));
 		assert_ok!(Voting::vote(Origin::signed(1), 3, nay(5, 1)));
-		assert_eq!(tally(3), Tally::from_parts(0, 5, 5));
+		assert_eq!(tally(3), Tally::from_parts(0, 5, 0));
 		assert_eq!(Balances::usable_balance(1), 5);
 
 		assert_ok!(Voting::vote(Origin::signed(1), 3, aye(10, 0)));
 		assert_eq!(tally(3), Tally::from_parts(1, 0, 10));
 		assert_ok!(Voting::vote(Origin::signed(1), 3, nay(10, 0)));
-		assert_eq!(tally(3), Tally::from_parts(0, 1, 10));
+		assert_eq!(tally(3), Tally::from_parts(0, 1, 0));
 		assert_eq!(Balances::usable_balance(1), 0);
 
 		assert_ok!(Voting::remove_vote(Origin::signed(1), None, 3));
@@ -376,10 +376,10 @@ fn classwise_delegation_works() {
 	new_test_ext().execute_with(|| {
 		Polls::set(
 			vec![
-				(0, Ongoing(Tally::default(), 0)),
-				(1, Ongoing(Tally::default(), 1)),
-				(2, Ongoing(Tally::default(), 2)),
-				(3, Ongoing(Tally::default(), 2)),
+				(0, Ongoing(Tally::new(0), 0)),
+				(1, Ongoing(Tally::new(0), 1)),
+				(2, Ongoing(Tally::new(0), 2)),
+				(3, Ongoing(Tally::new(0), 2)),
 			]
 			.into_iter()
 			.collect(),
@@ -403,9 +403,9 @@ fn classwise_delegation_works() {
 		assert_eq!(
 			Polls::get(),
 			vec![
-				(0, Ongoing(Tally::from_parts(6, 2, 35), 0)),
-				(1, Ongoing(Tally::from_parts(6, 2, 35), 1)),
-				(2, Ongoing(Tally::from_parts(6, 2, 35), 2)),
+				(0, Ongoing(Tally::from_parts(6, 2, 15), 0)),
+				(1, Ongoing(Tally::from_parts(6, 2, 15), 1)),
+				(2, Ongoing(Tally::from_parts(6, 2, 15), 2)),
 				(3, Ongoing(Tally::from_parts(0, 0, 0), 2)),
 			]
 			.into_iter()
@@ -417,10 +417,10 @@ fn classwise_delegation_works() {
 		assert_eq!(
 			Polls::get(),
 			vec![
-				(0, Ongoing(Tally::from_parts(6, 2, 35), 0)),
-				(1, Ongoing(Tally::from_parts(6, 2, 35), 1)),
-				(2, Ongoing(Tally::from_parts(6, 2, 35), 2)),
-				(3, Ongoing(Tally::from_parts(0, 6, 15), 2)),
+				(0, Ongoing(Tally::from_parts(6, 2, 15), 0)),
+				(1, Ongoing(Tally::from_parts(6, 2, 15), 1)),
+				(2, Ongoing(Tally::from_parts(6, 2, 15), 2)),
+				(3, Ongoing(Tally::from_parts(0, 6, 0), 2)),
 			]
 			.into_iter()
 			.collect()
@@ -432,10 +432,10 @@ fn classwise_delegation_works() {
 		assert_eq!(
 			Polls::get(),
 			vec![
-				(0, Ongoing(Tally::from_parts(6, 2, 35), 0)),
-				(1, Ongoing(Tally::from_parts(6, 2, 35), 1)),
-				(2, Ongoing(Tally::from_parts(1, 7, 35), 2)),
-				(3, Ongoing(Tally::from_parts(0, 1, 10), 2)),
+				(0, Ongoing(Tally::from_parts(6, 2, 15), 0)),
+				(1, Ongoing(Tally::from_parts(6, 2, 15), 1)),
+				(2, Ongoing(Tally::from_parts(1, 7, 10), 2)),
+				(3, Ongoing(Tally::from_parts(0, 1, 0), 2)),
 			]
 			.into_iter()
 			.collect()
@@ -451,10 +451,10 @@ fn classwise_delegation_works() {
 		assert_eq!(
 			Polls::get(),
 			vec![
-				(0, Ongoing(Tally::from_parts(4, 2, 33), 0)),
-				(1, Ongoing(Tally::from_parts(4, 2, 33), 1)),
-				(2, Ongoing(Tally::from_parts(4, 2, 33), 2)),
-				(3, Ongoing(Tally::from_parts(0, 4, 13), 2)),
+				(0, Ongoing(Tally::from_parts(4, 2, 13), 0)),
+				(1, Ongoing(Tally::from_parts(4, 2, 13), 1)),
+				(2, Ongoing(Tally::from_parts(4, 2, 13), 2)),
+				(3, Ongoing(Tally::from_parts(0, 4, 0), 2)),
 			]
 			.into_iter()
 			.collect()
@@ -483,10 +483,10 @@ fn classwise_delegation_works() {
 		assert_eq!(
 			Polls::get(),
 			vec![
-				(0, Ongoing(Tally::from_parts(7, 2, 36), 0)),
-				(1, Ongoing(Tally::from_parts(8, 2, 37), 1)),
-				(2, Ongoing(Tally::from_parts(9, 2, 38), 2)),
-				(3, Ongoing(Tally::from_parts(0, 9, 18), 2)),
+				(0, Ongoing(Tally::from_parts(7, 2, 16), 0)),
+				(1, Ongoing(Tally::from_parts(8, 2, 17), 1)),
+				(2, Ongoing(Tally::from_parts(9, 2, 18), 2)),
+				(3, Ongoing(Tally::from_parts(0, 9, 0), 2)),
 			]
 			.into_iter()
 			.collect()
@@ -497,7 +497,7 @@ fn classwise_delegation_works() {
 #[test]
 fn redelegation_after_vote_ending_should_keep_lock() {
 	new_test_ext().execute_with(|| {
-		Polls::set(vec![(0, Ongoing(Tally::default(), 0))].into_iter().collect());
+		Polls::set(vec![(0, Ongoing(Tally::new(0), 0))].into_iter().collect());
 		assert_ok!(Voting::delegate(Origin::signed(1), 0, 2, Conviction::Locked1x, 5));
 		assert_ok!(Voting::vote(Origin::signed(2), 0, aye(10, 1)));
 		Polls::set(vec![(0, Completed(1, true))].into_iter().collect());
@@ -515,9 +515,9 @@ fn lock_amalgamation_valid_with_multiple_removed_votes() {
 	new_test_ext().execute_with(|| {
 		Polls::set(
 			vec![
-				(0, Ongoing(Tally::default(), 0)),
-				(1, Ongoing(Tally::default(), 0)),
-				(2, Ongoing(Tally::default(), 0)),
+				(0, Ongoing(Tally::new(0), 0)),
+				(1, Ongoing(Tally::new(0), 0)),
+				(2, Ongoing(Tally::new(0), 0)),
 			]
 			.into_iter()
 			.collect(),
@@ -587,7 +587,7 @@ fn lock_amalgamation_valid_with_multiple_delegations() {
 #[test]
 fn lock_amalgamation_valid_with_move_roundtrip_to_delegation() {
 	new_test_ext().execute_with(|| {
-		Polls::set(vec![(0, Ongoing(Tally::default(), 0))].into_iter().collect());
+		Polls::set(vec![(0, Ongoing(Tally::new(0), 0))].into_iter().collect());
 		assert_ok!(Voting::vote(Origin::signed(1), 0, aye(5, 1)));
 		Polls::set(vec![(0, Completed(1, true))].into_iter().collect());
 		assert_ok!(Voting::remove_vote(Origin::signed(1), Some(0), 0));
@@ -599,7 +599,7 @@ fn lock_amalgamation_valid_with_move_roundtrip_to_delegation() {
 		assert_ok!(Voting::unlock(Origin::signed(1), 0, 1));
 		assert_eq!(Balances::usable_balance(1), 0);
 
-		Polls::set(vec![(1, Ongoing(Tally::default(), 0))].into_iter().collect());
+		Polls::set(vec![(1, Ongoing(Tally::new(0), 0))].into_iter().collect());
 		assert_ok!(Voting::vote(Origin::signed(1), 1, aye(5, 2)));
 		Polls::set(vec![(1, Completed(1, true))].into_iter().collect());
 		assert_ok!(Voting::remove_vote(Origin::signed(1), Some(0), 1));
@@ -627,7 +627,7 @@ fn lock_amalgamation_valid_with_move_roundtrip_to_casting() {
 		assert_ok!(Voting::unlock(Origin::signed(1), 0, 1));
 		assert_eq!(Balances::usable_balance(1), 5);
 
-		Polls::set(vec![(0, Ongoing(Tally::default(), 0))].into_iter().collect());
+		Polls::set(vec![(0, Ongoing(Tally::new(0), 0))].into_iter().collect());
 		assert_ok!(Voting::vote(Origin::signed(1), 0, aye(10, 1)));
 		Polls::set(vec![(0, Completed(1, true))].into_iter().collect());
 		assert_ok!(Voting::remove_vote(Origin::signed(1), Some(0), 0));
@@ -688,9 +688,9 @@ fn lock_aggregation_over_different_classes_with_casting_works() {
 	new_test_ext().execute_with(|| {
 		Polls::set(
 			vec![
-				(0, Ongoing(Tally::default(), 0)),
-				(1, Ongoing(Tally::default(), 1)),
-				(2, Ongoing(Tally::default(), 2)),
+				(0, Ongoing(Tally::new(0), 0)),
+				(1, Ongoing(Tally::new(0), 1)),
+				(2, Ongoing(Tally::new(0), 2)),
 			]
 			.into_iter()
 			.collect(),
@@ -747,10 +747,10 @@ fn errors_with_vote_work() {
 		assert_ok!(Voting::undelegate(Origin::signed(1), 0));
 		Polls::set(
 			vec![
-				(0, Ongoing(Tally::default(), 0)),
-				(1, Ongoing(Tally::default(), 0)),
-				(2, Ongoing(Tally::default(), 0)),
-				(3, Ongoing(Tally::default(), 0)),
+				(0, Ongoing(Tally::new(0), 0)),
+				(1, Ongoing(Tally::new(0), 0)),
+				(2, Ongoing(Tally::new(0), 0)),
+				(3, Ongoing(Tally::new(0), 0)),
 			]
 			.into_iter()
 			.collect(),