Pin ed25519-dalek to 1.0.0-pre.3 in support tests

Fix test build

Author: jordy25519

Cargo.lock

@@ -102,13 +102,12 @@ pub enum Never {}
 ///
 /// # Examples
 ///
-/// ```
+/// ```no_compile
 /// # use frame_support::traits::Get;
 /// # use frame_support::parameter_types;
 /// // This function cannot be used in a const context.
 /// fn non_const_expression() -> u64 { 99 }
 ///
-/// ```no_compile
 /// parameter_types! {
 ///    pub const Argument: u64 = 42 + FIXED_VALUE;
 ///    /// Visibility of the type is optional

frame/support/src/lib.rs

@@ -17,8 +17,11 @@ frame-support = { version = "2.0.0-alpha.5", default-features = false, path = ".
 sp-inherents = { version = "2.0.0-alpha.5", default-features = false, path = "../../../primitives/inherents" }
 sp-runtime = { version = "2.0.0-alpha.5", default-features = false, path = "../../../primitives/runtime" }
 sp-core = { version = "2.0.0-alpha.5", default-features = false, path = "../../../primitives/core" }
-trybuild = "1.0.17"
+trybuild = "1.0.24"
 pretty_assertions = "0.6.1"
+# pin ed25519-dalek to 1.0.0-pre.3
+# otherwise cargo will resolve 1.0.0-pre.4 which is breaking.
+ed25519-dalek = "=1.0.0-pre.3"
 
 [features]
 default = ["std"]

frame/support/test/Cargo.toml

@@ -1380,7 +1380,7 @@ mod tests {
 		pub const MaximumBlockWeight: Weight = 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 		pub const MaximumBlockLength: u32 = 1024;
-		pub const Version: RuntimeVersion = RuntimeVersion {
+		pub Version: RuntimeVersion = RuntimeVersion {
 			spec_name: sp_version::create_runtime_str!("test"),
 			impl_name: sp_version::create_runtime_str!("system-test"),
 			authoring_version: 1,

frame/system/src/lib.rs

@@ -121,9 +121,28 @@ macro_rules! implement_per_thing {
 		///
 		#[doc = $title]
 		#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-		#[derive(Encode, Decode, Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, RuntimeDebug, CompactAs)]
+		#[derive(Encode, Decode, Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, RuntimeDebug)]
 		pub struct $name($type);
 
+		/// Implementation makes any compact encoding of `PerThing::Inner` valid,
+		/// when decoding it will saturate up to `PerThing::ACCURACY`.
+		impl CompactAs for $name {
+			type As = $type;
+			fn encode_as(&self) -> &Self::As {
+				&self.0
+			}
+			fn decode_from(x: Self::As) -> Self {
+				// Saturates if `x` is more than `$max` internally. 
+				Self::from_parts(x)
+			}
+		}
+
+		impl From<codec::Compact<$name>> for $name {
+			fn from(x: codec::Compact<$name>) -> $name {
+				x.0
+			}
+		}
+
 		impl PerThing for $name {
 			type Inner = $type;
 			type Upper = $upper_type;
@@ -261,8 +280,8 @@ macro_rules! implement_per_thing {
 			}
 
 			/// See [`PerThing::one`].
-			pub fn one() -> Self {
-				<Self as PerThing>::one()
+			pub const fn one() -> Self {
+				Self::from_parts($max)
 			}
 
 			/// See [`PerThing::zero`].
@@ -714,6 +733,17 @@ macro_rules! implement_per_thing {
 				);
 			}
 
+			#[test]
+			fn compact_decoding_saturate_when_beyond_accuracy() {
+				use num_traits::Bounded;
+				use codec::Compact;
+
+				let p = Compact::<$name>::decode(&mut &Compact(<$type>::max_value()).encode()[..])
+					.unwrap();
+				assert_eq!((p.0).0, $max);
+				assert_eq!($name::from(p), $name::max_value());
+			}
+
 			#[test]
 			fn per_things_div_works() {
 				// normal

primitives/arithmetic/src/per_things.rs

@@ -496,19 +496,19 @@ fn duplicate_target_is_ignored() {
 		(30, 50, vec![1, 1, 2]),
 	];
 
-	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
+	let PhragmenResult { winners, assignments } = elect::<_, _, TestCurrencyToVote, Output>(
 		2,
 		2,
 		candidates,
 		voters,
 	).unwrap();
-	let winners = to_without_backing(winners);
+	let (winners, _): (Vec<i32>, Vec<_>) = winners.into_iter().unzip();
 
 	assert_eq!(winners, vec![(2), (3)]);
 	assert_eq!(
 		assignments
 			.into_iter()
-			.map(|x| (x.who, x.distribution.into_iter().map(|(w, _)| w).collect::<Vec<_>>()))
+			.map(|x| (x.0, x.1.into_iter().map(|(w, _)| w).collect::<Vec<_>>()))
 			.collect::<Vec<_>>(),
 		vec![
 			(10, vec![2, 3]),
@@ -526,19 +526,19 @@ fn duplicate_target_is_ignored_when_winner() {
 		(20, 100, vec![1, 2]),
 	];
 
-	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
+	let PhragmenResult { winners, assignments } = elect::<_, _, TestCurrencyToVote, Output>(
 		2,
 		2,
 		candidates,
 		voters,
 	).unwrap();
-	let winners = to_without_backing(winners);
+	let (winners, _): (Vec<i32>, Vec<_>) = winners.into_iter().unzip();
 
 	assert_eq!(winners, vec![1, 2]);
 	assert_eq!(
 		assignments
 			.into_iter()
-			.map(|x| (x.who, x.distribution.into_iter().map(|(w, _)| w).collect::<Vec<_>>()))
+			.map(|x| (x.0, x.1.into_iter().map(|(w, _)| w).collect::<Vec<_>>()))
 			.collect::<Vec<_>>(),
 		vec![
 			(10, vec![1, 2]),

primitives/phragmen/src/tests.rs

@@ -870,12 +870,12 @@ mod tests {
 		).unwrap();
 
 		let proof_db = proof.into_memory_db::<Blake2Hasher>();
-		let first_storage_root = delta_trie_root::<Layout, _, _, _, _, _>(
+		let first_storage_root = delta_trie_root::<Layout, _, _, _, _>(
 			&mut proof_db.clone(),
 			storage_root,
 			valid_delta,
 		).unwrap();
-		let second_storage_root = delta_trie_root::<Layout, _, _, _, _, _>(
+		let second_storage_root = delta_trie_root::<Layout, _, _, _, _>(
 			&mut proof_db.clone(),
 			storage_root,
 			invalid_delta,