impl HasCompact for Perbill and Permill (paritytech#1411)

* impl Compact<> and HasCompact for Permill Perbill * update parity-codec to 2.2 * add Cargo.lock * add lock and build for runtime * rebuild Cargo.lock after rebase
bdevux · Apr 12, 2019 · ae4f49a · ae4f49a
1 parent 6302186
commit ae4f49a
Show file tree

Hide file tree

Showing 53 changed files with 228 additions and 157 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/basic-authorship/Cargo.toml b/core/basic-authorship/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.4"
-parity-codec = "2.1"
+parity-codec = "2.2"
 sr-primitives = { path = "../../core/sr-primitives" }
 substrate-client = { path = "../../core/client" }
 substrate-consensus-aura-primitives = { path = "../../core/consensus/aura/primitives" }

diff --git a/core/client/db/Cargo.toml b/core/client/db/Cargo.toml
@@ -15,7 +15,7 @@ substrate-primitives = { path = "../../primitives" }
 sr-primitives = { path = "../../sr-primitives" }
 substrate-client = { path = "../../client" }
 substrate-state-machine = { path = "../../state-machine" }
-parity-codec = "2.1"
+parity-codec = "2.2"
 parity-codec-derive = "2.1"
 substrate-executor = { path = "../../executor" }
 substrate-state-db = { path = "../../state-db" }

diff --git a/core/consensus/aura/Cargo.toml b/core/consensus/aura/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 description = "Aura consensus algorithm for substrate"
 
 [dependencies]
-parity-codec = "2.1"
+parity-codec = "2.2"
 substrate-client = { path = "../../client" }
 substrate-primitives = { path = "../../primitives" }
 srml-support = { path = "../../../srml/support" }

diff --git a/core/consensus/aura/primitives/Cargo.toml b/core/consensus/aura/primitives/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 
 [dependencies]
-parity-codec = { version = "2.1", default-features = false }
+parity-codec = { version = "2.2", default-features = false }
 substrate-client = { path = "../../../client", default-features = false }
 substrate-primitives = { path = "../../../primitives", default-features = false }
 srml-support = { path = "../../../../srml/support", default-features = false }

diff --git a/core/consensus/common/Cargo.toml b/core/consensus/common/Cargo.toml
@@ -13,7 +13,7 @@ futures = "0.1"
 sr-version = { path = "../../sr-version" }
 sr-primitives = { path = "../../sr-primitives" }
 tokio = "0.1.7"
-parity-codec = "2.1"
+parity-codec = "2.2"
 parity-codec-derive = "2.0"
 
 [dev-dependencies]

diff --git a/core/consensus/rhd/Cargo.toml b/core/consensus/rhd/Cargo.toml
@@ -6,7 +6,7 @@ description = "Rhododendron Round-Based consensus-algorithm for substrate"
 
 [dependencies]
 futures = "0.1.17"
-parity-codec = { version = "2.1" }
+parity-codec = { version = "2.2" }
 parity-codec-derive = { version = "2.0" }
 substrate-primitives = { path = "../../primitives" }
 substrate-consensus-common = { path = "../common" }

diff --git a/core/executor/Cargo.toml b/core/executor/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 error-chain = "0.12"
-parity-codec = "2.1"
+parity-codec = "2.2"
 sr-io = { path = "../sr-io" }
 substrate-primitives = { path = "../primitives" }
 substrate-trie = { path = "../trie" }

diff --git a/core/executor/wasm/Cargo.lock b/core/executor/wasm/Cargo.lock
diff --git a/core/finality-grandpa/Cargo.toml b/core/finality-grandpa/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 futures = "0.1"
-parity-codec = "2.1"
+parity-codec = "2.2"
 parity-codec-derive = "2.0"
 sr-primitives = { path = "../sr-primitives" }
 substrate-consensus-common = { path = "../consensus/common" }

diff --git a/core/finality-grandpa/primitives/Cargo.toml b/core/finality-grandpa/primitives/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 substrate-client = { path = "../../client", default-features = false }
 substrate-primitives = { path = "../../primitives", default-features = false }
-parity-codec = { version = "2.1", default-features = false }
+parity-codec = { version = "2.2", default-features = false }
 parity-codec-derive = { version = "2.1", default-features = false }
 sr-primitives = { path = "../../sr-primitives", default-features = false }
 sr-std = { path = "../../sr-std", default-features = false }

diff --git a/core/network/Cargo.toml b/core/network/Cargo.toml
@@ -20,7 +20,7 @@ substrate-primitives = { path = "../../core/primitives" }
 substrate-consensus-common = { path = "../../core/consensus/common" }
 substrate-client = { path = "../../core/client" }
 sr-primitives = { path = "../../core/sr-primitives" }
-parity-codec = "2.1"
+parity-codec = "2.2"
 parity-codec-derive = "2.1"
 substrate-network-libp2p = { path = "../../core/network-libp2p" }
 tokio = "0.1.11"

diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 sr-std = { path = "../sr-std", default-features = false }
-parity-codec = { version = "2.1", default-features = false }
+parity-codec = { version = "2.2", default-features = false }
 parity-codec-derive = { version = "2.1", default-features = false }
 rustc-hex = { version = "2.0", default-features = false }
 serde = { version = "1.0", default-features = false }

diff --git a/core/rpc/Cargo.toml b/core/rpc/Cargo.toml
@@ -10,7 +10,7 @@ jsonrpc-macros = { git="https://github.com/paritytech/jsonrpc.git" }
 jsonrpc-pubsub = { git="https://github.com/paritytech/jsonrpc.git" }
 log = "0.4"
 parking_lot = "0.7.1"
-parity-codec = "2.1"
+parity-codec = "2.2"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

diff --git a/core/service/Cargo.toml b/core/service/Cargo.toml
@@ -24,7 +24,7 @@ substrate-consensus-common = { path = "../../core/consensus/common" }
 substrate-network = { path = "../../core/network" }
 substrate-client = { path = "../../core/client" }
 substrate-client-db = { path = "../../core/client/db" }
-parity-codec = "2.1"
+parity-codec = "2.2"
 substrate-executor = { path = "../../core/executor" }
 substrate-transaction-pool = { path = "../../core/transaction-pool" }
 substrate-rpc-servers = { path = "../../core/rpc-servers" }

diff --git a/core/sr-io/Cargo.toml b/core/sr-io/Cargo.toml
@@ -10,7 +10,7 @@ rustc_version = "0.2"
 [dependencies]
 sr-std = { path = "../sr-std", default-features = false }
 substrate-primitives = { path = "../primitives", default-features = false }
-parity-codec = { version = "2.1", default-features = false }
+parity-codec = { version = "2.2", default-features = false }
 hash-db = { git = "https://github.com/paritytech/trie", default-features = false }
 
 environmental = { version = "~1.0", optional = true }

diff --git a/core/sr-primitives/Cargo.toml b/core/sr-primitives/Cargo.toml
@@ -8,7 +8,7 @@ num-traits = { version = "0.2", default-features = false }
 integer-sqrt = { version = "0.1.2" }
 serde = { version = "1.0", optional = true }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "2.1", default-features = false }
+parity-codec = { version = "2.2", default-features = false }
 parity-codec-derive = { version = "2.1", default-features = false }
 substrate-primitives = { path = "../primitives", default-features = false }
 sr-std = { path = "../sr-std", default-features = false }

diff --git a/core/sr-primitives/src/lib.rs b/core/sr-primitives/src/lib.rs
@@ -145,6 +145,22 @@ impl From<f32> for Permill {
 	}
 }
 
+impl codec::CompactAs for Permill {
+	type As = u32;
+	fn encode_as(&self) -> &u32 {
+		&self.0
+	}
+	fn decode_from(x: u32) -> Permill {
+		Permill(x)
+	}
+}
+
+impl From<codec::Compact<Permill>> for Permill {
+	fn from(x: codec::Compact<Permill>) -> Permill {
+		x.0
+	}
+}
+
 /// Perbill is parts-per-billion. It stores a value between 0 and 1 in fixed point and
 /// provides a means to multiply some other value by that.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
@@ -200,6 +216,22 @@ impl From<f32> for Perbill {
 	}
 }
 
+impl codec::CompactAs for Perbill {
+	type As = u32;
+	fn encode_as(&self) -> &u32 {
+		&self.0
+	}
+	fn decode_from(x: u32) -> Perbill {
+		Perbill(x)
+	}
+}
+
+impl From<codec::Compact<Perbill>> for Perbill {
+	fn from(x: codec::Compact<Perbill>) -> Perbill {
+		x.0
+	}
+}
+
 /// Ed25519 signature verify.
 #[derive(Eq, PartialEq, Clone, Default, Encode, Decode)]
 #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
@@ -623,4 +655,43 @@ mod tests {
 		let ex = super::OpaqueExtrinsic(vec![1, 2, 3, 4]);
 		assert_eq!(serde_json::to_string(&ex).unwrap(), "\"0x1001020304\"".to_owned());
 	}
+
+	#[test]
+	fn compact_permill_perbill_encoding() {
+		let tests = [(0u32, 1usize), (63, 1), (64, 2), (16383, 2), (16384, 4), (1073741823, 4), (1073741824, 5), (u32::max_value(), 5)];
+		for &(n, l) in &tests {
+			let compact: codec::Compact<super::Permill> = super::Permill(n).into();
+			let encoded = compact.encode();
+			assert_eq!(encoded.len(), l);
+			let decoded = <codec::Compact<super::Permill>>::decode(&mut & encoded[..]).unwrap();
+			let permill: super::Permill = decoded.into();
+			assert_eq!(permill, super::Permill(n));
+
+			let compact: codec::Compact<super::Perbill> = super::Perbill(n).into();
+			let encoded = compact.encode();
+			assert_eq!(encoded.len(), l);
+			let decoded = <codec::Compact<super::Perbill>>::decode(&mut & encoded[..]).unwrap();
+			let perbill: super::Perbill = decoded.into();
+			assert_eq!(perbill, super::Perbill(n));
+		}
+	}
+
+	#[derive(Encode, Decode, PartialEq, Eq, Debug)]
+	struct WithCompact<T: codec::HasCompact> {
+		data: T,
+	}
+
+	#[test]
+	fn test_has_compact_permill() {
+		let data = WithCompact { data: super::Permill(1) };
+		let encoded = data.encode();
+		assert_eq!(data, WithCompact::<super::Permill>::decode(&mut &encoded[..]).unwrap());
+	}
+
+	#[test]
+	fn test_has_compact_perbill() {
+		let data = WithCompact { data: super::Perbill(1) };
+		let encoded = data.encode();
+		assert_eq!(data, WithCompact::<super::Perbill>::decode(&mut &encoded[..]).unwrap());
+	}
 }
diff --git a/core/sr-sandbox/Cargo.toml b/core/sr-sandbox/Cargo.toml
@@ -11,7 +11,7 @@ rustc_version = "0.2"
 wasmi = { version = "0.4.3", optional = true }
 substrate-primitives = { path = "../primitives", default-features = false }
 sr-std = { path = "../sr-std", default-features = false }
-parity-codec = { version = "2.1", default-features = false }
+parity-codec = { version = "2.2", default-features = false }
 
 [dev-dependencies]
 wabt = "~0.7.4"

diff --git a/core/sr-version/Cargo.toml b/core/sr-version/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "2.1", default-features = false }
+parity-codec = { version = "2.2", default-features = false }
 parity-codec-derive = { version = "2.1", default-features = false }
 sr-std = { path = "../sr-std", default-features = false }
 sr-primitives = { path = "../sr-primitives", default-features = false }

diff --git a/core/state-db/Cargo.toml b/core/state-db/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 parking_lot = "0.7.1"
 log = "0.4"
 substrate-primitives = { path = "../../core/primitives" }
-parity-codec = "2.1"
+parity-codec = "2.2"
 parity-codec-derive = "2.1"
 
 [dev-dependencies]

diff --git a/core/state-machine/Cargo.toml b/core/state-machine/Cargo.toml
@@ -14,4 +14,4 @@ trie-db = { git = "https://github.com/paritytech/trie" }
 trie-root = { git = "https://github.com/paritytech/trie" }
 substrate-trie = { path = "../trie" }
 substrate-primitives = { path = "../primitives" }
-parity-codec = "2.1"
+parity-codec = "2.2"
diff --git a/core/test-client/Cargo.toml b/core/test-client/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 substrate-client = { path = "../client" }
-parity-codec = "2.1"
+parity-codec = "2.2"
 substrate-executor = { path = "../executor" }
 substrate-consensus-common = { path = "../consensus/common" }
 substrate-keyring = { path = "../../core/keyring" }

diff --git a/core/test-runtime/Cargo.toml b/core/test-runtime/Cargo.toml
@@ -8,7 +8,7 @@ log = { version = "0.4", optional = true }
 hex-literal = { version = "0.1.0", optional = true }
 serde = { version = "1.0", optional = true }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "2.1", default-features = false }
+parity-codec = { version = "2.2", default-features = false }
 parity-codec-derive = { version = "2.1", default-features = false }
 substrate-keyring = { path = "../keyring", optional = true }
 substrate-client = { path = "../client", default-features = false }