From 9b7a62dc749aca7effdc138e9b7d479665b461b0 Mon Sep 17 00:00:00 2001 From: chungquantin <56880684+chungquantin@users.noreply.github.com> Date: Fri, 13 Sep 2024 22:37:56 +0700 Subject: [PATCH] fix: event naming --- pallets/api/src/fungibles/mod.rs | 38 ++++++++++++------------------ pallets/api/src/fungibles/tests.rs | 24 +++++++++---------- 2 files changed, 27 insertions(+), 35 deletions(-) diff --git a/pallets/api/src/fungibles/mod.rs b/pallets/api/src/fungibles/mod.rs index 2d9c9281..de9b6fac 100644 --- a/pallets/api/src/fungibles/mod.rs +++ b/pallets/api/src/fungibles/mod.rs @@ -134,7 +134,7 @@ pub mod pallet { #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { /// Event emitted when allowance by `owner` to `spender` changes. - Approved { + Approve { /// The token. token: TokenIdOf, /// The owner providing the allowance. @@ -145,7 +145,7 @@ pub mod pallet { value: BalanceOf, }, /// Event emitted when a token transfer occurs. - Transferred { + Transfer { /// The token. token: TokenIdOf, /// The source of the transfer. `None` when minting. @@ -189,12 +189,7 @@ pub mod pallet { T::Lookup::unlookup(to.clone()), value, )?; - Self::deposit_event(Event::Transferred { - token, - from: Some(from), - to: Some(to), - value, - }); + Self::deposit_event(Event::Transfer { token, from: Some(from), to: Some(to), value }); Ok(()) } @@ -222,12 +217,7 @@ pub mod pallet { T::Lookup::unlookup(to.clone()), value, )?; - Self::deposit_event(Event::Transferred { - token, - from: Some(from), - to: Some(to), - value, - }); + Self::deposit_event(Event::Transfer { token, from: Some(from), to: Some(to), value }); Ok(()) } @@ -288,7 +278,7 @@ pub mod pallet { } }, }; - Self::deposit_event(Event::Approved { token, owner, spender, value }); + Self::deposit_event(Event::Approve { token, owner, spender, value }); Ok(Some(weight).into()) } @@ -316,7 +306,7 @@ pub mod pallet { ) .map_err(|e| e.with_weight(AssetsWeightInfoOf::::approve_transfer()))?; let value = AssetsOf::::allowance(token.clone(), &owner, &spender); - Self::deposit_event(Event::Approved { token, owner, spender, value }); + Self::deposit_event(Event::Approve { token, owner, spender, value }); Ok(().into()) } @@ -362,7 +352,7 @@ pub mod pallet { )?; WeightOf::::approve(1, 1) }; - Self::deposit_event(Event::Approved { token, owner, spender, value: new_allowance }); + Self::deposit_event(Event::Approve { token, owner, spender, value: new_allowance }); Ok(Some(weight).into()) } @@ -455,7 +445,7 @@ pub mod pallet { T::Lookup::unlookup(account.clone()), value, )?; - Self::deposit_event(Event::Transferred { token, from: None, to: Some(account), value }); + Self::deposit_event(Event::Transfer { token, from: None, to: Some(account), value }); Ok(()) } @@ -479,7 +469,7 @@ pub mod pallet { T::Lookup::unlookup(account.clone()), value, )?; - Self::deposit_event(Event::Transferred { token, from: Some(account), to: None, value }); + Self::deposit_event(Event::Transfer { token, from: Some(account), to: None, value }); Ok(()) } } @@ -508,10 +498,12 @@ pub mod pallet { use Read::*; match request { TotalSupply(token) => ReadResult::TotalSupply(AssetsOf::::total_supply(token)), - BalanceOf { token, owner } => - ReadResult::BalanceOf(AssetsOf::::balance(token, owner)), - Allowance { token, owner, spender } => - ReadResult::Allowance(AssetsOf::::allowance(token, &owner, &spender)), + BalanceOf { token, owner } => { + ReadResult::BalanceOf(AssetsOf::::balance(token, owner)) + }, + Allowance { token, owner, spender } => { + ReadResult::Allowance(AssetsOf::::allowance(token, &owner, &spender)) + }, TokenName(token) => ReadResult::TokenName( as MetadataInspect< AccountIdOf, >>::name(token)), diff --git a/pallets/api/src/fungibles/tests.rs b/pallets/api/src/fungibles/tests.rs index 1467446b..92a3c8ed 100644 --- a/pallets/api/src/fungibles/tests.rs +++ b/pallets/api/src/fungibles/tests.rs @@ -89,7 +89,7 @@ fn transfer_works() { let balance_after_transfer = Assets::balance(token, &to); assert_eq!(balance_after_transfer, balance_before_transfer + value); System::assert_last_event( - Event::Transferred { token, from: Some(from), to: Some(to), value }.into(), + Event::Transfer { token, from: Some(from), to: Some(to), value }.into(), ); }); } @@ -123,7 +123,7 @@ fn transfer_from_works() { assert_eq!(to_balance_after_transfer, to_balance_before_transfer + value); assert_eq!(from_balance_after_transfer, from_balance_before_transfer - value); System::assert_last_event( - Event::Transferred { token, from: Some(from), to: Some(to), value }.into(), + Event::Transfer { token, from: Some(from), to: Some(to), value }.into(), ); }); } @@ -195,7 +195,7 @@ mod approve { Ok(Some(WeightInfo::approve(1, 0)).into()) ); assert_eq!(Assets::allowance(token, &owner, &spender), value); - System::assert_last_event(Event::Approved { token, owner, spender, value }.into()); + System::assert_last_event(Event::Approve { token, owner, spender, value }.into()); // Approves a value to spend that is lower than the current allowance. assert_eq!( Fungibles::approve(signed(owner), token, spender, value / 2), @@ -203,7 +203,7 @@ mod approve { ); assert_eq!(Assets::allowance(token, &owner, &spender), value / 2); System::assert_last_event( - Event::Approved { token, owner, spender, value: value / 2 }.into(), + Event::Approve { token, owner, spender, value: value / 2 }.into(), ); // Approves a value to spend that is equal to the current allowance. assert_eq!( @@ -212,7 +212,7 @@ mod approve { ); assert_eq!(Assets::allowance(token, &owner, &spender), value / 2); System::assert_last_event( - Event::Approved { token, owner, spender, value: value / 2 }.into(), + Event::Approve { token, owner, spender, value: value / 2 }.into(), ); // Sets allowance to zero. assert_eq!( @@ -220,7 +220,7 @@ mod approve { Ok(Some(WeightInfo::approve(0, 1)).into()) ); assert_eq!(Assets::allowance(token, &owner, &spender), 0); - System::assert_last_event(Event::Approved { token, owner, spender, value: 0 }.into()); + System::assert_last_event(Event::Approve { token, owner, spender, value: 0 }.into()); }); } } @@ -248,12 +248,12 @@ fn increase_allowance_works() { assert_eq!(0, Assets::allowance(token, &owner, &spender)); assert_ok!(Fungibles::increase_allowance(signed(owner), token, spender, value)); assert_eq!(Assets::allowance(token, &owner, &spender), value); - System::assert_last_event(Event::Approved { token, owner, spender, value }.into()); + System::assert_last_event(Event::Approve { token, owner, spender, value }.into()); // Additive. assert_ok!(Fungibles::increase_allowance(signed(owner), token, spender, value)); assert_eq!(Assets::allowance(token, &owner, &spender), value * 2); System::assert_last_event( - Event::Approved { token, owner, spender, value: value * 2 }.into(), + Event::Approve { token, owner, spender, value: value * 2 }.into(), ); }); } @@ -293,7 +293,7 @@ fn decrease_allowance_works() { ); assert_eq!(Assets::allowance(token, &owner, &spender), value / 2); System::assert_last_event( - Event::Approved { token, owner, spender, value: value / 2 }.into(), + Event::Approve { token, owner, spender, value: value / 2 }.into(), ); // Saturating if current allowance is decreased more than the owner balance. assert_eq!( @@ -301,7 +301,7 @@ fn decrease_allowance_works() { Ok(Some(WeightInfo::approve(0, 1)).into()) ); assert_eq!(Assets::allowance(token, &owner, &spender), 0); - System::assert_last_event(Event::Approved { token, owner, spender, value: 0 }.into()); + System::assert_last_event(Event::Approve { token, owner, spender, value: 0 }.into()); }); } @@ -402,7 +402,7 @@ fn mint_works() { let balance_after_mint = Assets::balance(token, &to); assert_eq!(balance_after_mint, balance_before_mint + value); System::assert_last_event( - Event::Transferred { token, from: None, to: Some(to), value }.into(), + Event::Transfer { token, from: None, to: Some(to), value }.into(), ); }); } @@ -426,7 +426,7 @@ fn burn_works() { let balance_after_burn = Assets::balance(token, &from); assert_eq!(balance_after_burn, balance_before_burn - value); System::assert_last_event( - Event::Transferred { token, from: Some(from), to: None, value }.into(), + Event::Transfer { token, from: Some(from), to: None, value }.into(), ); }); }