Add tests

frame/support/Cargo.toml

@@ -34,6 +34,7 @@ smallvec = "1.4.0"
 [dev-dependencies]
 pretty_assertions = "0.6.1"
 frame-system = { version = "2.0.0-rc4", path = "../system" }
+parity-util-mem = { version = "0.6.1", features = ["primitive-types"] }
 
 [features]
 default = ["std"]

frame/support/src/dispatch.rs

@@ -2370,72 +2370,72 @@ mod tests {
 	}
 
 	const EXPECTED_METADATA: &'static [FunctionMetadata] = &[
-				FunctionMetadata {
-					name: DecodeDifferent::Encode("aux_0"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[
-						" Hi, this is a comment."
-					])
-				},
-				FunctionMetadata {
-					name: DecodeDifferent::Encode("aux_1"),
-					arguments: DecodeDifferent::Encode(&[
-						FunctionArgumentMetadata {
-							name: DecodeDifferent::Encode("_data"),
-							ty: DecodeDifferent::Encode("Compact<u32>")
-						}
-					]),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				FunctionMetadata {
-					name: DecodeDifferent::Encode("aux_2"),
-					arguments: DecodeDifferent::Encode(&[
-						FunctionArgumentMetadata {
-							name: DecodeDifferent::Encode("_data"),
-							ty: DecodeDifferent::Encode("i32"),
-						},
-						FunctionArgumentMetadata {
-							name: DecodeDifferent::Encode("_data2"),
-							ty: DecodeDifferent::Encode("String"),
-						}
-					]),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				FunctionMetadata {
-					name: DecodeDifferent::Encode("aux_3"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				FunctionMetadata {
-					name: DecodeDifferent::Encode("aux_4"),
-					arguments: DecodeDifferent::Encode(&[
-						FunctionArgumentMetadata {
-							name: DecodeDifferent::Encode("_data"),
-							ty: DecodeDifferent::Encode("i32"),
-						}
-					]),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				FunctionMetadata {
-					name: DecodeDifferent::Encode("aux_5"),
-					arguments: DecodeDifferent::Encode(&[
-						FunctionArgumentMetadata {
-							name: DecodeDifferent::Encode("_data"),
-							ty: DecodeDifferent::Encode("i32"),
-						},
-						FunctionArgumentMetadata {
-							name: DecodeDifferent::Encode("_data2"),
-							ty: DecodeDifferent::Encode("Compact<u32>")
-						}
-					]),
-					documentation: DecodeDifferent::Encode(&[]),
+		FunctionMetadata {
+			name: DecodeDifferent::Encode("aux_0"),
+			arguments: DecodeDifferent::Encode(&[]),
+			documentation: DecodeDifferent::Encode(&[
+				" Hi, this is a comment."
+			])
+		},
+		FunctionMetadata {
+			name: DecodeDifferent::Encode("aux_1"),
+			arguments: DecodeDifferent::Encode(&[
+				FunctionArgumentMetadata {
+					name: DecodeDifferent::Encode("_data"),
+					ty: DecodeDifferent::Encode("Compact<u32>")
+				}
+			]),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+		FunctionMetadata {
+			name: DecodeDifferent::Encode("aux_2"),
+			arguments: DecodeDifferent::Encode(&[
+				FunctionArgumentMetadata {
+					name: DecodeDifferent::Encode("_data"),
+					ty: DecodeDifferent::Encode("i32"),
 				},
-				FunctionMetadata {
-					name: DecodeDifferent::Encode("operational"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
+				FunctionArgumentMetadata {
+					name: DecodeDifferent::Encode("_data2"),
+					ty: DecodeDifferent::Encode("String"),
+				}
+			]),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+		FunctionMetadata {
+			name: DecodeDifferent::Encode("aux_3"),
+			arguments: DecodeDifferent::Encode(&[]),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+		FunctionMetadata {
+			name: DecodeDifferent::Encode("aux_4"),
+			arguments: DecodeDifferent::Encode(&[
+				FunctionArgumentMetadata {
+					name: DecodeDifferent::Encode("_data"),
+					ty: DecodeDifferent::Encode("i32"),
+				}
+			]),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+		FunctionMetadata {
+			name: DecodeDifferent::Encode("aux_5"),
+			arguments: DecodeDifferent::Encode(&[
+				FunctionArgumentMetadata {
+					name: DecodeDifferent::Encode("_data"),
+					ty: DecodeDifferent::Encode("i32"),
 				},
-			];
+				FunctionArgumentMetadata {
+					name: DecodeDifferent::Encode("_data2"),
+					ty: DecodeDifferent::Encode("Compact<u32>")
+				}
+			]),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+		FunctionMetadata {
+			name: DecodeDifferent::Encode("operational"),
+			arguments: DecodeDifferent::Encode(&[]),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+	];
 
 	pub struct TraitImpl {}
 

frame/support/src/inherent.rs

@@ -136,3 +136,139 @@ macro_rules! impl_outer_inherent {
 		}
 	};
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use sp_runtime::{traits, testing::{Header, self}};
+	use crate::dispatch::IsSubType;
+
+	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
+	enum Call {
+		Test(CallTest),
+		Test2(CallTest2),
+	}
+
+	impl From<CallTest> for Call {
+		fn from(call: CallTest) -> Self {
+			Self::Test(call)
+		}
+	}
+
+	impl From<CallTest2> for Call {
+		fn from(call: CallTest2) -> Self {
+			Self::Test2(call)
+		}
+	}
+
+	impl IsSubType<CallTest> for Call {
+		fn is_sub_type(&self) -> Option<&CallTest> {
+			match self {
+				Self::Test(test) => Some(test),
+				_ => None,
+			}
+		}
+	}
+
+	impl IsSubType<CallTest2> for Call {
+		fn is_sub_type(&self) -> Option<&CallTest2> {
+			match self {
+				Self::Test2(test) => Some(test),
+				_ => None,
+			}
+		}
+	}
+
+	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
+	enum CallTest {
+		Something,
+		SomethingElse,
+	}
+
+	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
+	enum CallTest2 {
+		Something,
+	}
+
+	struct ModuleTest;
+	impl ProvideInherent for ModuleTest {
+		type Call = CallTest;
+		type Error = sp_inherents::MakeFatalError<()>;
+		const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"test1235";
+
+		fn create_inherent(_: &InherentData) -> Option<Self::Call> {
+			Some(CallTest::Something)
+		}
+
+		fn check_inherent(call: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
+			match call {
+				CallTest::Something => Ok(()),
+				CallTest::SomethingElse => Err(().into()),
+			}
+		}
+	}
+
+	struct ModuleTest2;
+	impl ProvideInherent for ModuleTest2 {
+		type Call = CallTest2;
+		type Error = sp_inherents::MakeFatalError<()>;
+		const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"test1234";
+
+		fn create_inherent(_: &InherentData) -> Option<Self::Call> {
+			Some(CallTest2::Something)
+		}
+	}
+
+	type Block = testing::Block<Extrinsic>;
+
+	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
+	struct Extrinsic {
+		function: Call,
+	}
+
+	impl traits::Extrinsic for Extrinsic {
+		type Call = Call;
+		type SignaturePayload = ();
+
+		fn new(function: Call, _: Option<()>) -> Option<Self> {
+			Some(Self { function })
+		}
+	}
+
+	parity_util_mem::malloc_size_of_is_0!(Extrinsic);
+
+	impl_outer_inherent! {
+		impl Inherents where Block = Block, UncheckedExtrinsic = Extrinsic {
+			ModuleTest,
+			ModuleTest2,
+		}
+	}
+
+	#[test]
+	fn create_inherents_works() {
+		let inherents = InherentData::new().create_extrinsics();
+
+		let expected = vec![
+			Extrinsic { function: Call::Test(CallTest::Something) },
+			Extrinsic { function: Call::Test2(CallTest2::Something) },
+		];
+		assert_eq!(expected, inherents);
+	}
+
+	#[test]
+	fn check_inherents_works() {
+		let block = Block::new(
+			Header::default(),
+			vec![Extrinsic { function: Call::Test(CallTest::Something) }],
+		);
+
+		assert!(InherentData::new().check_extrinsics(&block).ok());
+
+		let block = Block::new(
+			Header::default(),
+			vec![Extrinsic { function: Call::Test(CallTest::SomethingElse) }],
+		);
+
+		assert!(InherentData::new().check_extrinsics(&block).fatal_error());
+	}
+}