From fdb826245e2d41cbc70ceb70031174993cad39d4 Mon Sep 17 00:00:00 2001 From: Stanly Johnson Date: Sun, 13 Mar 2022 20:57:16 +0400 Subject: [PATCH 1/2] remove no_op event --- frame/assets/src/functions.rs | 8 +------- frame/assets/src/tests.rs | 6 ------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/frame/assets/src/functions.rs b/frame/assets/src/functions.rs index 48a86ca3cfa04..0be79619e0967 100644 --- a/frame/assets/src/functions.rs +++ b/frame/assets/src/functions.rs @@ -529,14 +529,8 @@ impl, I: 'static> Pallet { maybe_need_admin: Option, f: TransferFlags, ) -> Result<(T::Balance, Option), DispatchError> { - // Early exist if no-op. + // Early exit if no-op. if amount.is_zero() { - Self::deposit_event(Event::Transferred { - asset_id: id, - from: source.clone(), - to: dest.clone(), - amount, - }); return Ok((amount, None)) } diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs index 7430b742e7d2a..fa52ff43179cc 100644 --- a/frame/assets/src/tests.rs +++ b/frame/assets/src/tests.rs @@ -620,12 +620,6 @@ fn transferring_less_than_one_unit_is_fine() { assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100)); assert_eq!(Assets::balance(0, 1), 100); assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 0)); - System::assert_last_event(mock::Event::Assets(crate::Event::Transferred { - asset_id: 0, - from: 1, - to: 2, - amount: 0, - })); }); } From 4a419ca12a57b8a2152bacc62cff6b8325274eee Mon Sep 17 00:00:00 2001 From: Stanly Johnson Date: Mon, 14 Mar 2022 14:39:22 +0400 Subject: [PATCH 2/2] ensure no transferred event emitted --- frame/assets/src/tests.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs index fa52ff43179cc..db0d6a5f212f9 100644 --- a/frame/assets/src/tests.rs +++ b/frame/assets/src/tests.rs @@ -620,6 +620,8 @@ fn transferring_less_than_one_unit_is_fine() { assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100)); assert_eq!(Assets::balance(0, 1), 100); assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 0)); + // `ForceCreated` and `Issued` but no `Transferred` event. + assert_eq!(System::events().len(), 2); }); }