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

* 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
+22 -10
View File
@@ -263,7 +263,7 @@ fn set_class_metadata_should_work() {
// Cannot add metadata to unknown asset
assert_noop!(
Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0u8; 20], false),
Error::<Test>::Unknown,
Error::<Test>::UnknownClass,
);
assert_ok!(Uniques::force_create(Origin::root(), 0, 1, false));
// Cannot add metadata to unowned asset
@@ -307,7 +307,10 @@ fn set_class_metadata_should_work() {
Uniques::clear_class_metadata(Origin::signed(2), 0),
Error::<Test>::NoPermission
);
assert_noop!(Uniques::clear_class_metadata(Origin::signed(1), 1), Error::<Test>::Unknown);
assert_noop!(
Uniques::clear_class_metadata(Origin::signed(1), 1),
Error::<Test>::UnknownClass
);
assert_ok!(Uniques::clear_class_metadata(Origin::signed(1), 0));
assert!(!ClassMetadataOf::<Test>::contains_key(0));
});
@@ -361,7 +364,10 @@ fn set_instance_metadata_should_work() {
Uniques::clear_metadata(Origin::signed(2), 0, 42),
Error::<Test>::NoPermission
);
assert_noop!(Uniques::clear_metadata(Origin::signed(1), 1, 42), Error::<Test>::Unknown);
assert_noop!(
Uniques::clear_metadata(Origin::signed(1), 1, 42),
Error::<Test>::UnknownClass
);
assert_ok!(Uniques::clear_metadata(Origin::signed(1), 0, 42));
assert!(!InstanceMetadataOf::<Test>::contains_key(0, 42));
});
@@ -486,7 +492,7 @@ fn burn_works() {
assert_ok!(Uniques::force_create(Origin::root(), 0, 1, false));
assert_ok!(Uniques::set_team(Origin::signed(1), 0, 2, 3, 4));
assert_noop!(Uniques::burn(Origin::signed(5), 0, 42, Some(5)), Error::<Test>::Unknown);
assert_noop!(Uniques::burn(Origin::signed(5), 0, 42, Some(5)), Error::<Test>::UnknownClass);
assert_ok!(Uniques::mint(Origin::signed(2), 0, 42, 5));
assert_ok!(Uniques::mint(Origin::signed(2), 0, 69, 5));
@@ -525,11 +531,11 @@ fn cancel_approval_works() {
assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
assert_noop!(
Uniques::cancel_approval(Origin::signed(2), 1, 42, None),
Error::<Test>::Unknown
Error::<Test>::UnknownClass
);
assert_noop!(
Uniques::cancel_approval(Origin::signed(2), 0, 43, None),
Error::<Test>::Unknown
Error::<Test>::UnknownClass
);
assert_noop!(
Uniques::cancel_approval(Origin::signed(3), 0, 42, None),
@@ -557,11 +563,11 @@ fn cancel_approval_works_with_admin() {
assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
assert_noop!(
Uniques::cancel_approval(Origin::signed(1), 1, 42, None),
Error::<Test>::Unknown
Error::<Test>::UnknownClass
);
assert_noop!(
Uniques::cancel_approval(Origin::signed(1), 0, 43, None),
Error::<Test>::Unknown
Error::<Test>::UnknownClass
);
assert_noop!(
Uniques::cancel_approval(Origin::signed(1), 0, 42, Some(4)),
@@ -583,8 +589,14 @@ fn cancel_approval_works_with_force() {
assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 2));
assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
assert_noop!(Uniques::cancel_approval(Origin::root(), 1, 42, None), Error::<Test>::Unknown);
assert_noop!(Uniques::cancel_approval(Origin::root(), 0, 43, None), Error::<Test>::Unknown);
assert_noop!(
Uniques::cancel_approval(Origin::root(), 1, 42, None),
Error::<Test>::UnknownClass
);
assert_noop!(
Uniques::cancel_approval(Origin::root(), 0, 43, None),
Error::<Test>::UnknownClass
);
assert_noop!(
Uniques::cancel_approval(Origin::root(), 0, 42, Some(4)),
Error::<Test>::WrongDelegate