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
551552
552 #[map(|keys| string_keys_to_bytes_keys(keys))]553 #[map(|keys| string_keys_to_bytes_keys(keys))]
553 keys: Option<Vec<String>>,554 keys: Option<Vec<String>>,
554 ) -> TokenData<CrossAccountId>, unique_api);555 ) -> TokenData<CrossAccountId>, unique_api;
556 changed_in 3, token_data_before_version_3(collection, token_id, string_keys_to_bytes_keys(keys)) => |value| value.into()
557 );
555558
556 pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);559 pass_method!(adminlist(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
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>;