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 <[email protected]>
paritytech · Jul 30, 2021 · b0ac09f · b0ac09f
1 parent af8bb2e
commit b0ac09f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 1 deletion.
diff --git a/client/beefy/Cargo.toml b/client/beefy/Cargo.toml
@@ -15,7 +15,7 @@ thiserror = "1.0"
 wasm-timer = "0.2.5"
 
 codec = { version = "2.0.0", package = "parity-scale-codec", features = ["derive"] }
-prometheus = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master"}
+prometheus = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" }
 
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/frame/beefy-mmr/Cargo.toml b/frame/beefy-mmr/Cargo.toml
@@ -11,6 +11,7 @@ hex = { version = "0.4", optional = true }
 codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"] }
 libsecp256k1 = { version = "0.6.0", default-features = false }
 log = { version = "0.4.13", default-features = false }
+scale-info = { version = "0.10.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.126", optional = true }
 
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

diff --git a/frame/beefy/Cargo.toml b/frame/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"] }
 serde = { version = "1.0.126", optional = true }
 
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -28,6 +29,7 @@ sp-staking = { git = "https://github.com/paritytech/substrate.git", branch = "ma
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"serde",
 	"beefy-primitives/std",
 	"frame-support/std",

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.
 	///