switch to scale-info

Author: ordian

primitive-types/Cargo.toml

@@ -13,8 +13,8 @@ uint = { version = "0.8.1", path = "../uint", default-features = false }
 impl-serde = { version = "0.3.0", path = "impls/serde", default-features = false, optional = true }
 impl-codec = { version = "0.4.1", path = "impls/codec", default-features = false, optional = true }
 impl-rlp = { version = "0.2", path = "impls/rlp", default-features = false, optional = true }
-# type-metadata = { version = "0.1", features = ["derive"], default-features = false, optional = true }
-type-metadata = { git = "https://github.com/type-metadata/type-metadata", default-features = false, features = ["derive"], optional = true }
+# scale-info = { version = "0.1", features = ["derive"], default-features = false, optional = true }
+scale-info = { git = "https://github.com/paritytech/scale-info", default-features = false, features = ["derive"], optional = true }
 
 [features]
 default = ["std"]
@@ -27,5 +27,5 @@ codec = ["impl-codec"]
 rlp = ["impl-rlp"]
 
 [[test]]
-name = "type_metadata"
-required-features = ["type-metadata"]
+name = "scale_info"
+required-features = ["scale-info"]

primitive-types/src/lib.rs

@@ -16,8 +16,8 @@
 
 use core::convert::TryFrom;
 use fixed_hash::{construct_fixed_hash, impl_fixed_hash_conversions};
-#[cfg(feature = "type-metadata")]
-use type_metadata::Metadata;
+#[cfg(feature = "scale-info")]
+use scale_info::Metadata;
 use uint::{construct_uint, uint_full_mul_reg};
 
 /// Error type for conversion.
@@ -29,33 +29,33 @@ pub enum Error {
 
 construct_uint! {
 	/// 128-bit unsigned integer.
-	#[cfg_attr(feature = "type-metadata", derive(Metadata))]
+	#[cfg_attr(feature = "scale-info", derive(Metadata))]
 	pub struct U128(2);
 }
 construct_uint! {
 	/// 256-bit unsigned integer.
-	#[cfg_attr(feature = "type-metadata", derive(Metadata))]
+	#[cfg_attr(feature = "scale-info", derive(Metadata))]
 	pub struct U256(4);
 }
 construct_uint! {
 	/// 512-bits unsigned integer.
-	#[cfg_attr(feature = "type-metadata", derive(Metadata))]
+	#[cfg_attr(feature = "scale-info", derive(Metadata))]
 	pub struct U512(8);
 }
 
 construct_fixed_hash! {
 	/// Fixed-size uninterpreted hash type with 20 bytes (160 bits) size.
-	#[cfg_attr(feature = "type-metadata", derive(Metadata))]
+	#[cfg_attr(feature = "scale-info", derive(Metadata))]
 	pub struct H160(20);
 }
 construct_fixed_hash! {
 	/// Fixed-size uninterpreted hash type with 32 bytes (256 bits) size.
-	#[cfg_attr(feature = "type-metadata", derive(Metadata))]
+	#[cfg_attr(feature = "scale-info", derive(Metadata))]
 	pub struct H256(32);
 }
 construct_fixed_hash! {
 	/// Fixed-size uninterpreted hash type with 64 bytes (512 bits) size.
-	#[cfg_attr(feature = "type-metadata", derive(Metadata))]
+	#[cfg_attr(feature = "scale-info", derive(Metadata))]
 	pub struct H512(64);
 }
 

primitive-types/tests/scale_info.rs

@@ -0,0 +1,30 @@
+// Copyright 2020 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Tests for scale-info feature of primitive-types.
+
+use primitive_types::{H256, U256};
+use scale_info::{Fields, Path, TypeComposite, TypeInfo};
+
+#[test]
+fn u256_scale_info() {
+	let r#type = TypeComposite::new()
+		.path(Path::new("U256", "primitive_types"))
+		.fields(Fields::unnamed().field_of::<[u64; 4]>());
+
+	assert_eq!(U256::type_info(), r#type.into());
+}
+
+#[test]
+fn h256_scale_info() {
+	let r#type = TypeComposite::new()
+		.path(Path::new("H256", "primitive_types"))
+		.fields(Fields::unnamed().field_of::<[u8; 32]>());
+
+	assert_eq!(H256::type_info(), r#type.into());
+}