Conviction pallet uses fungible trait

polkadot/runtime/rococo/src/weights/pallet_conviction_voting.rs

@@ -182,7 +182,7 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
 	/// Storage: Balances Freezes (r:1 w:0)
 	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn unlock() -> Weight {
+	fn release() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `12218`
 		//  Estimated: `30706`

polkadot/runtime/westend/src/weights/pallet_conviction_voting.rs

@@ -181,7 +181,7 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:1 w:0)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	fn unlock() -> Weight {
+	fn release() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `12218`
 		//  Estimated: `30706`

substrate/frame/conviction-voting/src/benchmarking.rs

@@ -244,7 +244,7 @@ benchmarks_instance_pallet! {
 		assert_matches!(VotingFor::<T, I>::get(&caller, &class), Voting::Casting(_));
 	}
 
-	unlock {
+	release {
 		let caller = funded_account::<T, I>("caller", 0);
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 		whitelist_account!(caller);
@@ -264,7 +264,7 @@ benchmarks_instance_pallet! {
 		let orig_usable = <T::Currency as fungible::Inspect<T::AccountId>>::reducible_balance(&caller, Expendable, Polite);
 		let polls = &all_polls[&class];
 
-		// Vote big on the class with the most ongoing votes of them to bump the lock and make it
+		// Vote big on the class with the most ongoing votes of them to bump the hold and make it
 		// hard to recompute when removed.
 		ConvictionVoting::<T, I>::vote(RawOrigin::Signed(caller.clone()).into(), polls[0], big_account_vote)?;
 		let now_usable = <T::Currency as fungible::Inspect<T::AccountId>>::reducible_balance(&caller, Expendable, Polite);
@@ -273,7 +273,7 @@ benchmarks_instance_pallet! {
 		// Remove the vote
 		ConvictionVoting::<T, I>::remove_vote(RawOrigin::Signed(caller.clone()).into(), Some(class.clone()), polls[0])?;
 
-		// We can now unlock on `class` from 200 to 100...
+		// We can now release on `class` from 200 to 100...
 	}: _(RawOrigin::Signed(caller.clone()), class, caller_lookup)
 	verify {
 		assert_eq!(orig_usable, <T::Currency as fungible::Inspect<T::AccountId>>::reducible_balance(&caller, Expendable, Polite));

substrate/frame/conviction-voting/src/conviction.rs

@@ -41,20 +41,20 @@ use crate::types::Delegations;
 	MaxEncodedLen,
 )]
 pub enum Conviction {
-	/// 0.1x votes, unlocked.
+	/// 0.1x votes, not held.
 	None,
-	/// 1x votes, locked for an enactment period following a successful vote.
-	Locked1x,
-	/// 2x votes, locked for 2x enactment periods following a successful vote.
-	Locked2x,
-	/// 3x votes, locked for 4x...
-	Locked3x,
-	/// 4x votes, locked for 8x...
-	Locked4x,
-	/// 5x votes, locked for 16x...
-	Locked5x,
-	/// 6x votes, locked for 32x...
-	Locked6x,
+	/// 1x votes, held for an enactment period following a successful vote.
+	Held1x,
+	/// 2x votes, held for 2x enactment periods following a successful vote.
+	Held2x,
+	/// 3x votes, held for 4x...
+	Held3x,
+	/// 4x votes, held for 8x...
+	Held4x,
+	/// 5x votes, held for 16x...
+	Held5x,
+	/// 6x votes, held for 32x...
+	Held6x,
 }
 
 impl Default for Conviction {
@@ -67,12 +67,12 @@ impl From<Conviction> for u8 {
 	fn from(c: Conviction) -> u8 {
 		match c {
 			Conviction::None => 0,
-			Conviction::Locked1x => 1,
-			Conviction::Locked2x => 2,
-			Conviction::Locked3x => 3,
-			Conviction::Locked4x => 4,
-			Conviction::Locked5x => 5,
-			Conviction::Locked6x => 6,
+			Conviction::Held1x => 1,
+			Conviction::Held2x => 2,
+			Conviction::Held3x => 3,
+			Conviction::Held4x => 4,
+			Conviction::Held5x => 5,
+			Conviction::Held6x => 6,
 		}
 	}
 }
@@ -82,29 +82,29 @@ impl TryFrom<u8> for Conviction {
 	fn try_from(i: u8) -> Result<Conviction, ()> {
 		Ok(match i {
 			0 => Conviction::None,
-			1 => Conviction::Locked1x,
-			2 => Conviction::Locked2x,
-			3 => Conviction::Locked3x,
-			4 => Conviction::Locked4x,
-			5 => Conviction::Locked5x,
-			6 => Conviction::Locked6x,
+			1 => Conviction::Held1x,
+			2 => Conviction::Held2x,
+			3 => Conviction::Held3x,
+			4 => Conviction::Held4x,
+			5 => Conviction::Held5x,
+			6 => Conviction::Held6x,
 			_ => return Err(()),
 		})
 	}
 }
 
 impl Conviction {
 	/// The amount of time (in number of periods) that our conviction implies a successful voter's
-	/// balance should be locked for.
-	pub fn lock_periods(self) -> u32 {
+	/// balance should be held for.
+	pub fn hold_periods(self) -> u32 {
 		match self {
 			Conviction::None => 0,
-			Conviction::Locked1x => 1,
-			Conviction::Locked2x => 2,
-			Conviction::Locked3x => 4,
-			Conviction::Locked4x => 8,
-			Conviction::Locked5x => 16,
-			Conviction::Locked6x => 32,
+			Conviction::Held1x => 1,
+			Conviction::Held2x => 2,
+			Conviction::Held3x => 4,
+			Conviction::Held4x => 8,
+			Conviction::Held5x => 16,
+			Conviction::Held6x => 32,
 		}
 	}
 
@@ -126,6 +126,6 @@ impl Bounded for Conviction {
 		Conviction::None
 	}
 	fn max_value() -> Self {
-		Conviction::Locked6x
+		Conviction::Held6x
 	}
 }