difftreelog
cargo fmt
in: master
4 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -844,30 +844,31 @@
Ok(())
}
- pub fn bytes_keys_to_property_keys(keys: Vec<Vec<u8>>) -> Result<Vec<PropertyKey>, DispatchError> {
+ pub fn bytes_keys_to_property_keys(
+ keys: Vec<Vec<u8>>,
+ ) -> Result<Vec<PropertyKey>, DispatchError> {
keys.into_iter()
.map(|key| -> Result<PropertyKey, DispatchError> {
// TODO Fix error
- key.try_into().map_err(|_| DispatchError::Other("Can't read property key"))
+ key.try_into()
+ .map_err(|_| DispatchError::Other("Can't read property key"))
})
.collect::<Result<Vec<PropertyKey>, DispatchError>>()
}
pub fn filter_collection_properties(
collection_id: CollectionId,
- keys: Vec<PropertyKey>
+ keys: Vec<PropertyKey>,
) -> Result<Vec<Property>, DispatchError> {
let properties = Self::collection_properties(collection_id);
- let properties = keys.into_iter()
+ let properties = keys
+ .into_iter()
.filter_map(|key| {
- properties.get_property(&key)
- .map(|value| {
- Property {
- key,
- value: value.clone()
- }
- })
+ properties.get_property(&key).map(|value| Property {
+ key,
+ value: value.clone(),
+ })
})
.collect();
@@ -876,18 +877,18 @@
pub fn filter_property_permissions(
collection_id: CollectionId,
- keys: Vec<PropertyKey>
+ keys: Vec<PropertyKey>,
) -> Result<Vec<PropertyKeyPermission>, DispatchError> {
let permissions = Self::property_permissions(collection_id);
- let key_permissions = keys.into_iter()
+ let key_permissions = keys
+ .into_iter()
.filter_map(|key| {
- permissions.get(&key)
- .map(|permission| {
- PropertyKeyPermission {
- key,
- permission: permission.clone()
- }
+ permissions
+ .get(&key)
+ .map(|permission| PropertyKeyPermission {
+ key,
+ permission: permission.clone(),
})
})
.collect();
@@ -1169,11 +1170,7 @@
fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;
fn const_metadata(&self, token: TokenId) -> Vec<u8>;
fn variable_metadata(&self, token: TokenId) -> Vec<u8>;
- fn token_properties(
- &self,
- token_id: TokenId,
- keys: Vec<PropertyKey>
- ) -> Vec<Property>;
+ fn token_properties(&self, token_id: TokenId, keys: Vec<PropertyKey>) -> Vec<Property>;
/// Amount of unique collection tokens
fn total_supply(&self) -> u32;
/// Amount of different tokens account has (Applicable to nonfungible/refungible)
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -336,11 +336,7 @@
Vec::new()
}
- fn token_properties(
- &self,
- _token_id: TokenId,
- _keys: Vec<PropertyKey>
- ) -> Vec<Property> {
+ fn token_properties(&self, _token_id: TokenId, _keys: Vec<PropertyKey>) -> Vec<Property> {
Vec::new()
}
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -386,22 +386,15 @@
.into_inner()
}
- fn token_properties(
- &self,
- token_id: TokenId,
- keys: Vec<PropertyKey>
- ) -> Vec<Property> {
+ fn token_properties(&self, token_id: TokenId, keys: Vec<PropertyKey>) -> Vec<Property> {
let properties = <Pallet<T>>::token_properties((self.id, token_id));
keys.into_iter()
.filter_map(|key| {
- properties.get_property(&key)
- .map(|value| {
- Property {
- key,
- value: value.clone()
- }
- })
+ properties.get_property(&key).map(|value| Property {
+ key,
+ value: value.clone(),
+ })
})
.collect()
}
pallets/refungible/src/common.rsdiffbeforeafterbothno syntactic changes