Derive scale_info::TypeInfo for types used in polkadot (#218)

* Add scale-info TypeInfo derives * Update scale-info * Add crates.io patches * Use substrate aj-metadata-vnext branch * Revert master branch substrate deps * Add scale-info to beefy-pallet * scale-info v0.9.0 * Remove github dependencies and patches * More TypeInfo derives * Update scale-info to 0.10.0 * Add missing scale-info dependency * Add missing TypeInfo derive * Hide TypeInfo under a feature. Co-authored-by: Tomasz Drwięga <tomasz@parity.io>
paritytech · Jul 30, 2021 · 52403e9 · 52403e9
1 parent 3f0dd16
commit 52403e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/primitives/beefy/Cargo.toml b/primitives/beefy/Cargo.toml
@@ -7,6 +7,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"] }
+scale-info = { version = "0.10.0", default-features = false, features = ["derive"], optional = true }
 
 sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

diff --git a/primitives/beefy/src/lib.rs b/primitives/beefy/src/lib.rs
@@ -79,6 +79,7 @@ pub type ValidatorSetId = u64;
 
 /// A set of BEEFY authorities, a.k.a. validators.
 #[derive(Decode, Encode, Debug, PartialEq, Clone)]
+#[cfg_attr(feature = "scale-info", derive(scale_info::TypeInfo))]
 pub struct ValidatorSet<AuthorityId> {
 	/// Public keys of the validator set elements
 	pub validators: Vec<AuthorityId>,
@@ -104,6 +105,7 @@ pub type MmrRootHash = H256;
 
 /// A consensus log item for BEEFY.
 #[derive(Decode, Encode)]
+#[cfg_attr(feature = "scale-info", derive(scale_info::TypeInfo))]
 pub enum ConsensusLog<AuthorityId: Codec> {
 	/// The authorities have changed.
 	#[codec(index = 1)]
@@ -121,6 +123,7 @@ pub enum ConsensusLog<AuthorityId: Codec> {
 /// A vote message is a direct vote created by a BEEFY node on every voting round
 /// and is gossiped to its peers.
 #[derive(Debug, Decode, Encode)]
+#[cfg_attr(feature = "scale-info", derive(scale_info::TypeInfo))]
 pub struct VoteMessage<Hash, Number, Id, Signature> {
 	/// Commit to information extracted from a finalized block
 	pub commitment: Commitment<Number, Hash>,

diff --git a/primitives/beefy/src/mmr.rs b/primitives/beefy/src/mmr.rs
@@ -80,6 +80,7 @@ impl MmrLeafVersion {
 
 /// Details of the next BEEFY authority set.
 #[derive(Debug, Default, PartialEq, Eq, Clone, Encode, Decode)]
+#[cfg_attr(feature = "scale-info", derive(scale_info::TypeInfo))]
 pub struct BeefyNextAuthoritySet<MerkleRoot> {
 	/// Id of the next set.
 	///