git.delta.rocks / unique-network / refs/commits / ba2c7d200136

difftreelog

fix runtime api versioning for TokenData

Yaroslav Bolyukin2022-10-28parent: #835d378.patch.diff
in: master

3 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -545,13 +545,16 @@
 		keys: Option<Vec<String>>
 	) -> Vec<PropertyKeyPermission>, unique_api);
 
-	pass_method!(token_data(
-		collection: CollectionId,
-		token_id: TokenId,
+	pass_method!(
+		token_data(
+			collection: CollectionId,
+			token_id: TokenId,
 
-		#[map(|keys| string_keys_to_bytes_keys(keys))]
-		keys: Option<Vec<String>>,
-	) -> TokenData<CrossAccountId>, unique_api);
+			#[map(|keys| string_keys_to_bytes_keys(keys))]
+			keys: Option<Vec<String>>,
+		) -> TokenData<CrossAccountId>, unique_api;
+		changed_in 3, token_data_before_version_3(collection, token_id, string_keys_to_bytes_keys(keys)) => |value| value.into()
+	);
 
 	pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);
 	pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -221,6 +221,7 @@
 }
 
 /// Token data.
+#[struct_versioning::versioned(version = 2, upper)]
 #[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct TokenData<CrossAccountId> {
@@ -231,6 +232,7 @@
 	pub owner: Option<CrossAccountId>,
 
 	/// Token pieces.
+	#[version(2.., upper(0))]
 	pub pieces: u128,
 }
 
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
2020
21use up_data_structs::{21use up_data_structs::{
22 CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,22 CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,
23 PropertyKeyPermission, TokenData, TokenChild, RpcCollectionVersion1,23 PropertyKeyPermission, TokenData, TokenChild, RpcCollectionVersion1, TokenDataVersion1,
24};24};
2525
26use sp_std::vec::Vec;26use sp_std::vec::Vec;
77 keys: Option<Vec<Vec<u8>>>77 keys: Option<Vec<Vec<u8>>>
78 ) -> Result<TokenData<CrossAccountId>>;78 ) -> Result<TokenData<CrossAccountId>>;
79
80 #[changed_in(3)]
81 fn token_data(
82 collection: CollectionId,
83 token_id: TokenId,
84 keys: Option<Vec<Vec<u8>>>
85 ) -> Result<TokenDataVersion1<CrossAccountId>>;
7986
80 /// Total number of tokens in collection.87 /// Total number of tokens in collection.
81 fn total_supply(collection: CollectionId) -> Result<u32>;88 fn total_supply(collection: CollectionId) -> Result<u32>;