Companion for #8615: enrich metadata with type information (#3336)

* Use beefy branch with scale-info

* Add patches

* Sprinkle some TypeInfo derives

* Add some TypeInfo deriv

* Cargo.lock

* Derive TypeInfo and skip type params for Xcm types

* Cargo.lock

* Fix up scale_info bounds attributes

* Fix up dependencies

* Use my own beefy-primitives branch

* Bump BEEFY

* Update patches

* Add some scale-info dependencies and TypeInfo derives

* More TypeInfo decoration

* Update scale-info

* Some TypeInfos and remove more Event pallet::metadata

* Moar TypeInfos

* TypeInfos galore, fix up metadata runtime API

* TypeInfo

* TypeInfos, update other runtime metadata APIs

* Fix up Kusama, comment out some `usize` QueueSize parameter types

* Remove local diener patches

* Cargo.lock

* Cargo.lock

* Update to scale-info crates.io release

* Update primitive-types branch

* Update pallet-beefy to use custom branch

* Update other parity-common deps

* Update parity-common patches

* bump a bunch of deps in parity-common

* Remove parity-common patches

* Bump finality-grandpa version

* Cargo.lock

* Update scale-info to 0.9.1

* Add recursion_limit for runtime-parachains

* Add some scale_info attributes

* Cargo.lock

* Revert finality-grandpa bump

* Cargo.lock, scale-info update

* cargo update

* Make sure using patched version of finality-grandpa

* Use patched scale-info

* Update to scale-info 0.10.0

* Update finality-grandpa

* Cargo.lock

* Update beefy deps

* Update beefy deps again

* Add scale-info dependency

* Remove deprecated pallet::metadata attributes.

* Add some missing scale-info deps and derives

* Use some variant struct call syntax

* Add missing TypeInfo impl

* Add some more TypeInfo impls

* Convert some call enum struct variant constructors

* More scale-info deps and derives

* Call enum struct variants

* TypeInfo derives

* Call enum variant structs

* scale-info deps and derives

* Call enum variant struct constructors

* Use beefy-primitives scale-info feature

* Use grandpa-bridge-gadget master branch

* Remove finality-grandpa patch

* Add missing scale_info dependency and derive

* Fix up some call variant constructors

* Add missing scale_info dependency

* Fix some test errors

* More TypeInfo derives

* More call variant structs

* Call variant structs in tests

* Cargo.lock

* Fmt

* Fix more call struct variants

* Another call struct variant

* add scale-info/std features explicitly

* More call struct variants

* Add missing scale-info dependency

* Fmt

* review: activate scale-info/std where missing

* Remove some duplicate std feature activation

* review: add scale_info bounds() attr

* More call variant structs

* Remove recursion limit

* Update beefy-primitives

* Update beefy-primitives

* Fix simnet call variant struct errors

* Fmt

* cargo update -p beefy-primitives

* Add some missing TypeInfo derives

* Fix some call variants

* Fix some call variant underscores

* Cargo.lock

* Cargo.lock

* Add missing TypeInfo derive

* Add some more missing TypeInfo derives

* Even more missing TypeInfo derives

* Add TypeInfo derives to new xcm types

* Fmt

* Cargo.lock

* Add missing TypeInfo impls

* Cargo.lock

* More missing TypeInfos

* Fixes

* Cargo.lock

* Cargo.lock

* Add TypeInfo impls to xcm v2

* Update to scale-info 1.0

* Update finality-grandpa 0.14.4, patch for now

* Update beefy

* Remove patched finality-grandpa

* Add TypeInfo impl to Outcome

* Fixes

* Call variant struct

* Call variant struct

* Fix test

* Add TypeInfo impl

* Cargo.lock

* Cargo.lock

* Cargo.lock

* git checkout master Cargo.lock

* update Substrate

* Add missing scale-info features for beefy-primitives

* Fmt

* Remove check for now

* Update beefy-primitives, removes scale-info feature

* Update beefy-primitives again

Co-authored-by: adoerr <0xad@gmx.net>
Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: parity-processbot <>
Co-authored-by: Bastian Köcher <info@kchr.de>

polkadot/bridges/modules/dispatch/src/lib.rs

@@ -399,6 +399,7 @@ mod tests {
 	use super::*;
 	use frame_support::{dispatch::GetDispatchInfo, parameter_types, weights::Weight};
 	use frame_system::{EventRecord, Phase};
+	use scale_info::TypeInfo;
 	use sp_core::H256;
 	use sp_runtime::{
 		testing::Header,
@@ -412,7 +413,7 @@ mod tests {
 	const SOURCE_CHAIN_ID: ChainId = *b"srce";
 	const TARGET_CHAIN_ID: ChainId = *b"trgt";
 
-	#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq)]
+	#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo)]
 	pub struct TestAccountPublic(AccountId);
 
 	impl IdentifyAccount for TestAccountPublic {
@@ -423,7 +424,7 @@ mod tests {
 		}
 	}
 
-	#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq)]
+	#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo)]
 	pub struct TestSignature(AccountId);
 
 	impl Verify for TestSignature {
@@ -516,7 +517,7 @@ mod tests {
 
 	impl Contains<Call> for TestCallFilter {
 		fn contains(call: &Call) -> bool {
-			!matches!(*call, Call::System(frame_system::Call::fill_block(_)))
+			!matches!(*call, Call::System(frame_system::Call::fill_block { .. }))
 		}
 	}
 
@@ -569,8 +570,9 @@ mod tests {
 			let id = [0; 4];
 
 			const BAD_SPEC_VERSION: SpecVersion = 99;
-			let mut message =
-				prepare_root_message(Call::System(<frame_system::Call<TestRuntime>>::remark(vec![1, 2, 3])));
+			let mut message = prepare_root_message(Call::System(frame_system::Call::<TestRuntime>::remark {
+				remark: vec![1, 2, 3],
+			}));
 			let weight = message.weight;
 			message.spec_version = BAD_SPEC_VERSION;
 
@@ -599,7 +601,7 @@ mod tests {
 	fn should_fail_on_weight_mismatch() {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
-			let call = Call::System(<frame_system::Call<TestRuntime>>::remark(vec![1, 2, 3]));
+			let call = Call::System(frame_system::Call::<TestRuntime>::remark { remark: vec![1, 2, 3] });
 			let call_weight = call.get_dispatch_info().weight;
 			let mut message = prepare_root_message(call);
 			message.weight = 7;
@@ -637,7 +639,7 @@ mod tests {
 			let call_origin = CallOrigin::TargetAccount(1, TestAccountPublic(1), TestSignature(99));
 			let message = prepare_message(
 				call_origin,
-				Call::System(<frame_system::Call<TestRuntime>>::remark(vec![1, 2, 3])),
+				Call::System(frame_system::Call::<TestRuntime>::remark { remark: vec![1, 2, 3] }),
 			);
 			let weight = message.weight;
 
@@ -687,8 +689,9 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
 
-			let mut message =
-				prepare_root_message(Call::System(<frame_system::Call<TestRuntime>>::remark(vec![1, 2, 3])));
+			let mut message = prepare_root_message(Call::System(frame_system::Call::<TestRuntime>::remark {
+				remark: vec![1, 2, 3],
+			}));
 			let weight = message.weight;
 			message.call.0 = vec![];
 
@@ -716,7 +719,9 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
 
-			let call = Call::System(<frame_system::Call<TestRuntime>>::fill_block(Perbill::from_percent(75)));
+			let call = Call::System(frame_system::Call::<TestRuntime>::fill_block {
+				ratio: Perbill::from_percent(75),
+			});
 			let weight = call.get_dispatch_info().weight;
 			let mut message = prepare_root_message(call);
 			message.weight = weight;
@@ -745,8 +750,9 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
 
-			let mut message =
-				prepare_root_message(Call::System(<frame_system::Call<TestRuntime>>::remark(vec![1, 2, 3])));
+			let mut message = prepare_root_message(Call::System(frame_system::Call::<TestRuntime>::remark {
+				remark: vec![1, 2, 3],
+			}));
 			let weight = message.weight;
 			message.dispatch_fee_payment = DispatchFeePayment::AtTargetChain;
 
@@ -779,8 +785,9 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
 
-			let mut message =
-				prepare_root_message(Call::System(<frame_system::Call<TestRuntime>>::remark(vec![1, 2, 3])));
+			let mut message = prepare_root_message(Call::System(frame_system::Call::<TestRuntime>::remark {
+				remark: vec![1, 2, 3],
+			}));
 			message.dispatch_fee_payment = DispatchFeePayment::AtTargetChain;
 
 			System::set_block_number(1);
@@ -808,7 +815,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
 
-			let call = Call::System(<frame_system::Call<TestRuntime>>::set_heap_pages(1));
+			let call = Call::System(frame_system::Call::<TestRuntime>::set_heap_pages { pages: 1 });
 			let message = prepare_target_message(call);
 
 			System::set_block_number(1);
@@ -835,7 +842,9 @@ mod tests {
 	fn should_dispatch_bridge_message_from_root_origin() {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
-			let message = prepare_root_message(Call::System(<frame_system::Call<TestRuntime>>::remark(vec![1, 2, 3])));
+			let message = prepare_root_message(Call::System(frame_system::Call::<TestRuntime>::remark {
+				remark: vec![1, 2, 3],
+			}));
 
 			System::set_block_number(1);
 			let result = Dispatch::dispatch(SOURCE_CHAIN_ID, TARGET_CHAIN_ID, id, Ok(message), |_, _| unreachable!());
@@ -862,7 +871,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
 
-			let call = Call::System(<frame_system::Call<TestRuntime>>::remark(vec![]));
+			let call = Call::System(frame_system::Call::<TestRuntime>::remark { remark: vec![] });
 			let message = prepare_target_message(call);
 
 			System::set_block_number(1);
@@ -890,7 +899,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let id = [0; 4];
 
-			let call = Call::System(<frame_system::Call<TestRuntime>>::remark(vec![]));
+			let call = Call::System(frame_system::Call::<TestRuntime>::remark { remark: vec![] });
 			let message = prepare_source_message(call);
 
 			System::set_block_number(1);
@@ -915,7 +924,7 @@ mod tests {
 
 	#[test]
 	fn origin_is_checked_when_verifying_sending_message_using_source_root_account() {
-		let call = Call::System(<frame_system::Call<TestRuntime>>::remark(vec![]));
+		let call = Call::System(frame_system::Call::<TestRuntime>::remark { remark: vec![] });
 		let message = prepare_root_message(call);
 
 		// When message is sent by Root, CallOrigin::SourceRoot is allowed
@@ -930,7 +939,7 @@ mod tests {
 
 	#[test]
 	fn origin_is_checked_when_verifying_sending_message_using_target_account() {
-		let call = Call::System(<frame_system::Call<TestRuntime>>::remark(vec![]));
+		let call = Call::System(frame_system::Call::<TestRuntime>::remark { remark: vec![] });
 		let message = prepare_target_message(call);
 
 		// When message is sent by Root, CallOrigin::TargetAccount is not allowed
@@ -955,7 +964,7 @@ mod tests {
 
 	#[test]
 	fn origin_is_checked_when_verifying_sending_message_using_source_account() {
-		let call = Call::System(<frame_system::Call<TestRuntime>>::remark(vec![]));
+		let call = Call::System(frame_system::Call::<TestRuntime>::remark { remark: vec![] });
 		let message = prepare_source_message(call);
 
 		// Sending a message from the expected origin account works