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
221}221}
222222
223/// Token data.223/// Token data.
224#[struct_versioning::versioned(version = 2, upper)]
224#[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]225#[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]
225#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]226#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
226pub struct TokenData<CrossAccountId> {227pub struct TokenData<CrossAccountId> {
231 pub owner: Option<CrossAccountId>,232 pub owner: Option<CrossAccountId>,
232233
233 /// Token pieces.234 /// Token pieces.
235 #[version(2.., upper(0))]
234 pub pieces: u128,236 pub pieces: u128,
235}237}
236238
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -20,7 +20,7 @@
 
 use up_data_structs::{
 	CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,
-	PropertyKeyPermission, TokenData, TokenChild, RpcCollectionVersion1,
+	PropertyKeyPermission, TokenData, TokenChild, RpcCollectionVersion1, TokenDataVersion1,
 };
 
 use sp_std::vec::Vec;
@@ -77,6 +77,13 @@
 			keys: Option<Vec<Vec<u8>>>
 		) -> Result<TokenData<CrossAccountId>>;
 
+		#[changed_in(3)]
+		fn token_data(
+			collection: CollectionId,
+			token_id: TokenId,
+			keys: Option<Vec<Vec<u8>>>
+		) -> Result<TokenDataVersion1<CrossAccountId>>;
+
 		/// Total number of tokens in collection.
 		fn total_supply(collection: CollectionId) -> Result<u32>;