Optional serde for phragmen support (#3994)

* Add serde to phragmen * Update lock file * and bump a version * and bump a version again * Apply suggestions from code review Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * revert impl-tarit for tuple update * revert session. * Revert "revert session." This reverts commit 98086c9. * Revert "revert impl-tarit for tuple update" This reverts commit 28a7fdd.
paritytech · Nov 1, 2019 · ec7c6cf · ec7c6cf
1 parent 17aab52
commit ec7c6cf
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/chain-spec/Cargo.toml b/core/chain-spec/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 substrate-chain-spec-derive = { path = "./derive" }
-impl-trait-for-tuples = "0.1.2"
+impl-trait-for-tuples = "0.1.3"
 network = { package = "substrate-network", path = "../../core/network" }
 primitives = { package = "substrate-primitives", path = "../primitives" }
 serde = { version = "1.0.101", features = ["derive"] }

diff --git a/core/phragmen/Cargo.toml b/core/phragmen/Cargo.toml
@@ -5,8 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-sr-primitives = { path = "../sr-primitives", default-features = false }
+serde = { version = "1.0.101", optional = true, features = ["derive"] }
 rstd = { package = "sr-std", path = "../sr-std", default-features = false }
+sr-primitives = { path = "../sr-primitives", default-features = false }
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../sr-io" }
@@ -16,6 +17,7 @@ rand = "0.7.2"
 [features]
 default = ["std"]
 std = [
+	"serde",
 	"rstd/std",
 	"sr-primitives/std",
 ]
diff --git a/core/phragmen/src/lib.rs b/core/phragmen/src/lib.rs
@@ -116,6 +116,7 @@ pub struct PhragmenResult<AccountId> {
 /// This, at the current version, resembles the `Exposure` defined in the staking SRML module, yet
 /// they do not necessarily have to be the same.
 #[derive(Default, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct Support<AccountId> {
 	/// The amount of support as the effect of self-vote.
 	pub own: ExtendedBalance,

diff --git a/core/sr-primitives/Cargo.toml b/core/sr-primitives/Cargo.toml
@@ -15,7 +15,7 @@ runtime_io = { package = "sr-io", path = "../sr-io", default-features = false }
 log = { version = "0.4.8", optional = true }
 paste = "0.1.6"
 rand = { version = "0.7.2", optional = true }
-impl-trait-for-tuples = "0.1.2"
+impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 serde_json = "1.0.41"

diff --git a/srml/authorship/Cargo.toml b/srml/authorship/Cargo.toml
@@ -14,7 +14,7 @@ sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
-impl-trait-for-tuples = "0.1.2"
+impl-trait-for-tuples = "0.1.3"
 
 [features]
 default = ["std"]

diff --git a/srml/finality-tracker/Cargo.toml b/srml/finality-tracker/Cargo.toml
@@ -12,7 +12,7 @@ rstd = { package = "sr-std", path = "../../core/sr-std", default-features = fals
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 support = { package = "srml-support", path = "../support", default-features = false }
 srml-system = { path = "../system", default-features = false }
-impl-trait-for-tuples = "0.1.2"
+impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }

diff --git a/srml/support/Cargo.toml b/srml/support/Cargo.toml
@@ -18,7 +18,7 @@ srml-support-procedural = { package = "srml-support-procedural", path = "./proce
 paste = "0.1.6"
 once_cell = { version = "0.2.4", default-features = false, optional = true }
 bitmask = { version = "0.5.0", default-features = false }
-impl-trait-for-tuples = "0.1.2"
+impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"

diff --git a/srml/system/Cargo.toml b/srml/system/Cargo.toml
@@ -14,7 +14,7 @@ runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = f
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 sr-version = { path = "../../core/sr-version", default-features = false }
 support = { package = "srml-support", path = "../support", default-features = false }
-impl-trait-for-tuples = "0.1.2"
+impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 criterion = "0.2.11"

diff --git a/srml/timestamp/Cargo.toml b/srml/timestamp/Cargo.toml
@@ -12,7 +12,7 @@ sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
 support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
-impl-trait-for-tuples = "0.1.2"
+impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../core/sr-io" }