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

difftreelog

fix(rpc) wrong return type for collectionTokens call

Yaroslav Bolyukin2022-04-12parent: #3bd9a5e.patch.diff
in: master

7 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
33		account: CrossAccountId,33		account: CrossAccountId,
34		at: Option<BlockHash>,34		at: Option<BlockHash>,
35	) -> Result<Vec<TokenId>>;35	) -> Result<Vec<TokenId>>;
36	#[rpc(name = "unique_collectionTokens")]
37	fn collection_tokens(
38		&self,
39		collection: CollectionId,
40		at: Option<BlockHash>,
41	) -> Result<Vec<TokenId>>;
36	#[rpc(name = "unique_tokenExists")]42	#[rpc(name = "unique_tokenExists")]
37	fn token_exists(43	fn token_exists(
38		&self,44		&self,
70		at: Option<BlockHash>,76		at: Option<BlockHash>,
71	) -> Result<Vec<u8>>;77	) -> Result<Vec<u8>>;
7278
73	#[rpc(name = "unique_collectionTokens")]
74	fn collection_tokens(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<u32>;
75	#[rpc(name = "unique_accountBalance")]79	#[rpc(name = "unique_accountBalance")]
76	fn account_balance(80	fn account_balance(
77		&self,81		&self,
226	CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,230	CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,
227{231{
228	pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);232	pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);
233	pass_method!(collection_tokens(collection: CollectionId) -> Vec<TokenId>);
229	pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);234	pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);
230	pass_method!(235	pass_method!(
231		token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>;236		token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>;
234	pass_method!(topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>);239	pass_method!(topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>);
235	pass_method!(const_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);240	pass_method!(const_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);
236	pass_method!(variable_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);241	pass_method!(variable_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);
237	pass_method!(collection_tokens(collection: CollectionId) -> u32);
238	pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32);242	pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32);
239	pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string());243	pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string());
240	pass_method!(allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string());244	pass_method!(allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string());
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
924	) -> DispatchResult;924	) -> DispatchResult;
925925
926	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;926	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;
927	fn collection_tokens(&self) -> Vec<TokenId>;
927	fn token_exists(&self, token: TokenId) -> bool;928	fn token_exists(&self, token: TokenId) -> bool;
928	fn last_token_id(&self) -> TokenId;929	fn last_token_id(&self) -> TokenId;
929930
930	fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;931	fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;
931	fn const_metadata(&self, token: TokenId) -> Vec<u8>;932	fn const_metadata(&self, token: TokenId) -> Vec<u8>;
932	fn variable_metadata(&self, token: TokenId) -> Vec<u8>;933	fn variable_metadata(&self, token: TokenId) -> Vec<u8>;
933934
934	/// How many tokens collection contains (Applicable to nonfungible/refungible)
935	fn collection_tokens(&self) -> u32;
936	/// Amount of different tokens account has (Applicable to nonfungible/refungible)935	/// Amount of different tokens account has (Applicable to nonfungible/refungible)
937	fn account_balance(&self, account: T::CrossAccountId) -> u32;936	fn account_balance(&self, account: T::CrossAccountId) -> u32;
938	/// Amount of specific token account have (Applicable to fungible/refungible)937	/// Amount of specific token account have (Applicable to fungible/refungible)
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
270		Vec::new()270		Vec::new()
271	}271	}
272272
273	fn collection_tokens(&self) -> u32 {273	fn collection_tokens(&self) -> Vec<TokenId> {
274		1274		vec![TokenId::default()]
275	}275	}
276276
277	fn account_balance(&self, account: T::CrossAccountId) -> u32 {277	fn account_balance(&self, account: T::CrossAccountId) -> u32 {
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
264			.collect()264			.collect()
265	}265	}
266
267	fn collection_tokens(&self) -> Vec<TokenId> {
268		<TokenData<T>>::iter_prefix((self.id,))
269			.map(|(id, _)| id)
270			.collect()
271	}
266272
267	fn token_exists(&self, token: TokenId) -> bool {273	fn token_exists(&self, token: TokenId) -> bool {
268		<Pallet<T>>::token_exists(self, token)274		<Pallet<T>>::token_exists(self, token)
288			.into_inner()294			.into_inner()
289	}295	}
290
291	fn collection_tokens(&self) -> u32 {
292		<Pallet<T>>::total_supply(self)
293	}
294296
295	fn account_balance(&self, account: T::CrossAccountId) -> u32 {297	fn account_balance(&self, account: T::CrossAccountId) -> u32 {
296		<AccountBalance<T>>::get((self.id, account))298		<AccountBalance<T>>::get((self.id, account))
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
273			.collect()273			.collect()
274	}274	}
275
276	fn collection_tokens(&self) -> Vec<TokenId> {
277		<TokenData<T>>::iter_prefix((self.id,))
278			.map(|(id, _)| id)
279			.collect()
280	}
275281
276	fn token_exists(&self, token: TokenId) -> bool {282	fn token_exists(&self, token: TokenId) -> bool {
277		<Pallet<T>>::token_exists(self, token)283		<Pallet<T>>::token_exists(self, token)
295			.into_inner()301			.into_inner()
296	}302	}
297
298	fn collection_tokens(&self) -> u32 {
299		<Pallet<T>>::total_supply(self)
300	}
301303
302	fn account_balance(&self, account: T::CrossAccountId) -> u32 {304	fn account_balance(&self, account: T::CrossAccountId) -> u32 {
303		<AccountBalance<T>>::get((self.id, account))305		<AccountBalance<T>>::get((self.id, account))
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
33		fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;33		fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;
3434
35		fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;35		fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;
36		fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>>;
36		fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool>;37		fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool>;
3738
38		fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;39		fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;
39		fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;40		fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;
40		fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>>;41		fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>>;
41		fn variable_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>>;42		fn variable_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>>;
4243
43		fn collection_tokens(collection: CollectionId) -> Result<u32>;
44		fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32>;44		fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32>;
45		fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128>;45		fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128>;
46		fn allowance(46		fn allowance(
modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
33                    dispatch_unique_runtime!(collection.variable_metadata(token))33                    dispatch_unique_runtime!(collection.variable_metadata(token))
34                }34                }
3535
36                fn collection_tokens(collection: CollectionId) -> Result<u32, DispatchError> {36                fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>, DispatchError> {
37                    dispatch_unique_runtime!(collection.collection_tokens())37                    dispatch_unique_runtime!(collection.collection_tokens())
38                }38                }
39                fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {39                fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {