pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-22 10:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Uniques Error::Unknown to something more sensible (#10895)

Browse Source 
* Rename Uniques Error::Unknown to something more sensible

* Typos

* Typos

* fmt

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Fix tests

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* fmt

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Gavin Wood
2022-02-22 11:42:46 +01:00
committed by GitHub
parent eb5f07a2e5
commit 939d1b089c
3 changed files with 58 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/uniques/src/functions.rs
+8 -6
View File
@@ -31,10 +31,11 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
&mut InstanceDetailsFor<T, I>,
) -> DispatchResult,
) -> DispatchResult {
let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::UnknownClass)?;
ensure!(!class_details.is_frozen, Error::<T, I>::Frozen);
let mut details = Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
let mut details =
Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::UnknownClass)?;
ensure!(!details.is_frozen, Error::<T, I>::Frozen);
with_details(&class_details, &mut details)?;
@@ -92,7 +93,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
maybe_check_owner: Option<T::AccountId>,
) -> Result<DestroyWitness, DispatchError> {
Class::<T, I>::try_mutate_exists(class, |maybe_details| {
let class_details = maybe_details.take().ok_or(Error::<T, I>::Unknown)?;
let class_details = maybe_details.take().ok_or(Error::<T, I>::UnknownClass)?;
if let Some(check_owner) = maybe_check_owner {
ensure!(class_details.owner == check_owner, Error::<T, I>::NoPermission);
}
@@ -131,7 +132,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
ensure!(!Asset::<T, I>::contains_key(class, instance), Error::<T, I>::AlreadyExists);
Class::<T, I>::try_mutate(&class, |maybe_class_details| -> DispatchResult {
let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::UnknownClass)?;
with_details(&class_details)?;
@@ -165,9 +166,10 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
let owner = Class::<T, I>::try_mutate(
&class,
|maybe_class_details| -> Result<T::AccountId, DispatchError> {
let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
let class_details =
maybe_class_details.as_mut().ok_or(Error::<T, I>::UnknownClass)?;
let details =
Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::UnknownClass)?;
with_details(&class_details, &details)?;
// Return the deposit.