From 03118268fb56f74e5d79b0c2cfe2364f35678065 Mon Sep 17 00:00:00 2001 From: doordashcon Date: Fri, 12 Nov 2021 21:18:26 +0000 Subject: [PATCH 1/9] AFNPEV recovery --- frame/recovery/src/lib.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs index 797581788077b..c2f31aa4007f7 100644 --- a/frame/recovery/src/lib.rs +++ b/frame/recovery/src/lib.rs @@ -263,21 +263,21 @@ pub mod pallet { #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { /// A recovery process has been set up for an \[account\]. - RecoveryCreated(T::AccountId), + RecoveryCreated{ account: T::AccountId }, /// A recovery process has been initiated for lost account by rescuer account. /// \[lost, rescuer\] - RecoveryInitiated(T::AccountId, T::AccountId), + RecoveryInitiated{ lost: T::AccountId, rescuer: T::AccountId }, /// A recovery process for lost account by rescuer account has been vouched for by sender. /// \[lost, rescuer, sender\] - RecoveryVouched(T::AccountId, T::AccountId, T::AccountId), + RecoveryVouched{ lost: T::AccountId, rescuer: T::AccountId, sender: T::AccountId }, /// A recovery process for lost account by rescuer account has been closed. /// \[lost, rescuer\] - RecoveryClosed(T::AccountId, T::AccountId), + RecoveryClosed{ lost: T::AccountId, rescuer: T::AccountId }, /// Lost account has been successfully recovered by rescuer account. /// \[lost, rescuer\] - AccountRecovered(T::AccountId, T::AccountId), + AccountRecovered{ lost: T::AccountId, rescuer: T::AccountId }, /// A recovery process has been removed for an \[account\]. - RecoveryRemoved(T::AccountId), + RecoveryRemoved{ account: T::AccountId }, } #[pallet::error] @@ -409,7 +409,7 @@ pub mod pallet { ensure_root(origin)?; // Create the recovery storage item. >::insert(&rescuer, &lost); - Self::deposit_event(Event::::AccountRecovered(lost, rescuer)); + Self::deposit_event(Event::::AccountRecovered{ lost: lost, rescuer: rescuer }); Ok(()) } @@ -472,7 +472,7 @@ pub mod pallet { // Create the recovery configuration storage item >::insert(&who, recovery_config); - Self::deposit_event(Event::::RecoveryCreated(who)); + Self::deposit_event(Event::::RecoveryCreated{ account: who }); Ok(()) } @@ -519,7 +519,7 @@ pub mod pallet { }; // Create the active recovery storage item >::insert(&account, &who, recovery_status); - Self::deposit_event(Event::::RecoveryInitiated(account, who)); + Self::deposit_event(Event::::RecoveryInitiated{ lost: account, rescuer: who }); Ok(()) } @@ -568,7 +568,7 @@ pub mod pallet { } // Update storage with the latest details >::insert(&lost, &rescuer, active_recovery); - Self::deposit_event(Event::::RecoveryVouched(lost, rescuer, who)); + Self::deposit_event(Event::::RecoveryVouched{ lost: lost, rescuer: rescuer, sender: who }); Ok(()) } @@ -617,7 +617,7 @@ pub mod pallet { frame_system::Pallet::::inc_consumers(&who).map_err(|_| Error::::BadState)?; // Create the recovery storage item Proxy::::insert(&who, &account); - Self::deposit_event(Event::::AccountRecovered(account, who)); + Self::deposit_event(Event::::AccountRecovered{ lost: account, rescuer: who }); Ok(()) } @@ -656,7 +656,7 @@ pub mod pallet { BalanceStatus::Free, ); debug_assert!(res.is_ok()); - Self::deposit_event(Event::::RecoveryClosed(who, rescuer)); + Self::deposit_event(Event::::RecoveryClosed{ lost: who, rescuer: rescuer }); Ok(()) } @@ -692,7 +692,7 @@ pub mod pallet { // Unreserve the initial deposit for the recovery configuration. T::Currency::unreserve(&who, recovery_config.deposit); - Self::deposit_event(Event::::RecoveryRemoved(who)); + Self::deposit_event(Event::::RecoveryRemoved{ account: who }); Ok(()) } From 7f969031c4c153bfcde2fad228af0bc78f9ec458 Mon Sep 17 00:00:00 2001 From: doordashcon Date: Fri, 12 Nov 2021 23:23:38 +0000 Subject: [PATCH 2/9] AFNPEV session --- frame/session/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs index 6779285ee3187..552ae6083f9e6 100644 --- a/frame/session/src/lib.rs +++ b/frame/session/src/lib.rs @@ -533,7 +533,7 @@ pub mod pallet { pub enum Event { /// New session has happened. Note that the argument is the \[session_index\], not the /// block number as the type might suggest. - NewSession(SessionIndex), + NewSession{ session_index: SessionIndex }, } /// Old name generated by `decl_event`. @@ -702,7 +702,7 @@ impl Pallet { >::put(next_changed); // Record that this happened. - Self::deposit_event(Event::NewSession(session_index)); + Self::deposit_event(Event::NewSession{ session_index: session_index }); // Tell everyone about the new session keys. T::SessionHandler::on_new_session::(changed, &session_keys, &queued_amalgamated); From 3ce87ace5f6541e69212b1f204795d85f9a35912 Mon Sep 17 00:00:00 2001 From: doordashcon Date: Sat, 13 Nov 2021 08:44:10 +0000 Subject: [PATCH 3/9] cargo +nightly fmt && cargo fmt --- frame/recovery/src/lib.rs | 26 +++++++++++++------------- frame/session/src/lib.rs | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs index c2f31aa4007f7..26830669e771c 100644 --- a/frame/recovery/src/lib.rs +++ b/frame/recovery/src/lib.rs @@ -263,21 +263,21 @@ pub mod pallet { #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { /// A recovery process has been set up for an \[account\]. - RecoveryCreated{ account: T::AccountId }, + RecoveryCreated { account: T::AccountId }, /// A recovery process has been initiated for lost account by rescuer account. /// \[lost, rescuer\] - RecoveryInitiated{ lost: T::AccountId, rescuer: T::AccountId }, + RecoveryInitiated { lost: T::AccountId, rescuer: T::AccountId }, /// A recovery process for lost account by rescuer account has been vouched for by sender. /// \[lost, rescuer, sender\] - RecoveryVouched{ lost: T::AccountId, rescuer: T::AccountId, sender: T::AccountId }, + RecoveryVouched { lost: T::AccountId, rescuer: T::AccountId, sender: T::AccountId }, /// A recovery process for lost account by rescuer account has been closed. /// \[lost, rescuer\] - RecoveryClosed{ lost: T::AccountId, rescuer: T::AccountId }, + RecoveryClosed { lost: T::AccountId, rescuer: T::AccountId }, /// Lost account has been successfully recovered by rescuer account. /// \[lost, rescuer\] - AccountRecovered{ lost: T::AccountId, rescuer: T::AccountId }, + AccountRecovered { lost: T::AccountId, rescuer: T::AccountId }, /// A recovery process has been removed for an \[account\]. - RecoveryRemoved{ account: T::AccountId }, + RecoveryRemoved { account: T::AccountId }, } #[pallet::error] @@ -409,7 +409,7 @@ pub mod pallet { ensure_root(origin)?; // Create the recovery storage item. >::insert(&rescuer, &lost); - Self::deposit_event(Event::::AccountRecovered{ lost: lost, rescuer: rescuer }); + Self::deposit_event(Event::::AccountRecovered { lost, rescuer }); Ok(()) } @@ -472,7 +472,7 @@ pub mod pallet { // Create the recovery configuration storage item >::insert(&who, recovery_config); - Self::deposit_event(Event::::RecoveryCreated{ account: who }); + Self::deposit_event(Event::::RecoveryCreated { account: who }); Ok(()) } @@ -519,7 +519,7 @@ pub mod pallet { }; // Create the active recovery storage item >::insert(&account, &who, recovery_status); - Self::deposit_event(Event::::RecoveryInitiated{ lost: account, rescuer: who }); + Self::deposit_event(Event::::RecoveryInitiated { lost: account, rescuer: who }); Ok(()) } @@ -568,7 +568,7 @@ pub mod pallet { } // Update storage with the latest details >::insert(&lost, &rescuer, active_recovery); - Self::deposit_event(Event::::RecoveryVouched{ lost: lost, rescuer: rescuer, sender: who }); + Self::deposit_event(Event::::RecoveryVouched { lost, rescuer, sender: who }); Ok(()) } @@ -617,7 +617,7 @@ pub mod pallet { frame_system::Pallet::::inc_consumers(&who).map_err(|_| Error::::BadState)?; // Create the recovery storage item Proxy::::insert(&who, &account); - Self::deposit_event(Event::::AccountRecovered{ lost: account, rescuer: who }); + Self::deposit_event(Event::::AccountRecovered { lost: account, rescuer: who }); Ok(()) } @@ -656,7 +656,7 @@ pub mod pallet { BalanceStatus::Free, ); debug_assert!(res.is_ok()); - Self::deposit_event(Event::::RecoveryClosed{ lost: who, rescuer: rescuer }); + Self::deposit_event(Event::::RecoveryClosed { lost: who, rescuer }); Ok(()) } @@ -692,7 +692,7 @@ pub mod pallet { // Unreserve the initial deposit for the recovery configuration. T::Currency::unreserve(&who, recovery_config.deposit); - Self::deposit_event(Event::::RecoveryRemoved{ account: who }); + Self::deposit_event(Event::::RecoveryRemoved { account: who }); Ok(()) } diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs index 552ae6083f9e6..37df4bfbbd994 100644 --- a/frame/session/src/lib.rs +++ b/frame/session/src/lib.rs @@ -533,7 +533,7 @@ pub mod pallet { pub enum Event { /// New session has happened. Note that the argument is the \[session_index\], not the /// block number as the type might suggest. - NewSession{ session_index: SessionIndex }, + NewSession { session_index: SessionIndex }, } /// Old name generated by `decl_event`. @@ -702,7 +702,7 @@ impl Pallet { >::put(next_changed); // Record that this happened. - Self::deposit_event(Event::NewSession{ session_index: session_index }); + Self::deposit_event(Event::NewSession { session_index }); // Tell everyone about the new session keys. T::SessionHandler::on_new_session::(changed, &session_keys, &queued_amalgamated); From 2daec79a345d6778a2bb70bf58304fe70c051c4b Mon Sep 17 00:00:00 2001 From: doordashcon Date: Sat, 13 Nov 2021 09:08:58 +0000 Subject: [PATCH 4/9] removed redundant comments --- frame/recovery/src/lib.rs | 8 ++------ frame/session/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs index 26830669e771c..37f8b39965250 100644 --- a/frame/recovery/src/lib.rs +++ b/frame/recovery/src/lib.rs @@ -262,21 +262,17 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { - /// A recovery process has been set up for an \[account\]. + /// A recovery process has been set up for an account. RecoveryCreated { account: T::AccountId }, /// A recovery process has been initiated for lost account by rescuer account. - /// \[lost, rescuer\] RecoveryInitiated { lost: T::AccountId, rescuer: T::AccountId }, /// A recovery process for lost account by rescuer account has been vouched for by sender. - /// \[lost, rescuer, sender\] RecoveryVouched { lost: T::AccountId, rescuer: T::AccountId, sender: T::AccountId }, /// A recovery process for lost account by rescuer account has been closed. - /// \[lost, rescuer\] RecoveryClosed { lost: T::AccountId, rescuer: T::AccountId }, /// Lost account has been successfully recovered by rescuer account. - /// \[lost, rescuer\] AccountRecovered { lost: T::AccountId, rescuer: T::AccountId }, - /// A recovery process has been removed for an \[account\]. + /// A recovery process has been removed for an account. RecoveryRemoved { account: T::AccountId }, } diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs index 37df4bfbbd994..b50171a8b41d4 100644 --- a/frame/session/src/lib.rs +++ b/frame/session/src/lib.rs @@ -531,7 +531,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { - /// New session has happened. Note that the argument is the \[session_index\], not the + /// New session has happened. Note that the argument is the session_index, not the /// block number as the type might suggest. NewSession { session_index: SessionIndex }, } From 19abcb3b51160feed8654ee9c38f646c7f10cff7 Mon Sep 17 00:00:00 2001 From: doordashcon Date: Sat, 13 Nov 2021 09:30:39 +0000 Subject: [PATCH 5/9] update --- frame/recovery/src/lib.rs | 6 +++--- frame/session/src/lib.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs index 37f8b39965250..811478b7cad58 100644 --- a/frame/recovery/src/lib.rs +++ b/frame/recovery/src/lib.rs @@ -405,7 +405,7 @@ pub mod pallet { ensure_root(origin)?; // Create the recovery storage item. >::insert(&rescuer, &lost); - Self::deposit_event(Event::::AccountRecovered { lost, rescuer }); + Self::deposit_event(Event::::AccountRecovered { lost: lost, rescuer: rescuer }); Ok(()) } @@ -564,7 +564,7 @@ pub mod pallet { } // Update storage with the latest details >::insert(&lost, &rescuer, active_recovery); - Self::deposit_event(Event::::RecoveryVouched { lost, rescuer, sender: who }); + Self::deposit_event(Event::::RecoveryVouched { lost: lost, rescuer: rescuer, sender: who }); Ok(()) } @@ -652,7 +652,7 @@ pub mod pallet { BalanceStatus::Free, ); debug_assert!(res.is_ok()); - Self::deposit_event(Event::::RecoveryClosed { lost: who, rescuer }); + Self::deposit_event(Event::::RecoveryClosed { lost: who, rescuer: rescuer }); Ok(()) } diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs index b50171a8b41d4..ef8af9e992535 100644 --- a/frame/session/src/lib.rs +++ b/frame/session/src/lib.rs @@ -702,7 +702,7 @@ impl Pallet { >::put(next_changed); // Record that this happened. - Self::deposit_event(Event::NewSession { session_index }); + Self::deposit_event(Event::NewSession { session_index: session_index }); // Tell everyone about the new session keys. T::SessionHandler::on_new_session::(changed, &session_keys, &queued_amalgamated); From db949cb084048a538fbcde366c44271b5ff06034 Mon Sep 17 00:00:00 2001 From: doordashcon Date: Sat, 13 Nov 2021 09:48:20 +0000 Subject: [PATCH 6/9] update & cargo +nightly fmt --- frame/recovery/src/lib.rs | 46 ++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs index 811478b7cad58..2767acd4aa7a5 100644 --- a/frame/recovery/src/lib.rs +++ b/frame/recovery/src/lib.rs @@ -263,17 +263,21 @@ pub mod pallet { #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { /// A recovery process has been set up for an account. - RecoveryCreated { account: T::AccountId }, + RecoveryCreated { lost_account: T::AccountId }, /// A recovery process has been initiated for lost account by rescuer account. - RecoveryInitiated { lost: T::AccountId, rescuer: T::AccountId }, + RecoveryInitiated { lost_account: T::AccountId, rescuer_account: T::AccountId }, /// A recovery process for lost account by rescuer account has been vouched for by sender. - RecoveryVouched { lost: T::AccountId, rescuer: T::AccountId, sender: T::AccountId }, + RecoveryVouched { + lost_account: T::AccountId, + rescuer_account: T::AccountId, + sender: T::AccountId, + }, /// A recovery process for lost account by rescuer account has been closed. - RecoveryClosed { lost: T::AccountId, rescuer: T::AccountId }, + RecoveryClosed { lost_account: T::AccountId, rescuer_account: T::AccountId }, /// Lost account has been successfully recovered by rescuer account. - AccountRecovered { lost: T::AccountId, rescuer: T::AccountId }, + AccountRecovered { lost_account: T::AccountId, rescuer_account: T::AccountId }, /// A recovery process has been removed for an account. - RecoveryRemoved { account: T::AccountId }, + RecoveryRemoved { lost_account: T::AccountId }, } #[pallet::error] @@ -405,7 +409,10 @@ pub mod pallet { ensure_root(origin)?; // Create the recovery storage item. >::insert(&rescuer, &lost); - Self::deposit_event(Event::::AccountRecovered { lost: lost, rescuer: rescuer }); + Self::deposit_event(Event::::AccountRecovered { + lost_account: lost, + rescuer_account: rescuer, + }); Ok(()) } @@ -468,7 +475,7 @@ pub mod pallet { // Create the recovery configuration storage item >::insert(&who, recovery_config); - Self::deposit_event(Event::::RecoveryCreated { account: who }); + Self::deposit_event(Event::::RecoveryCreated { lost_account: who }); Ok(()) } @@ -515,7 +522,10 @@ pub mod pallet { }; // Create the active recovery storage item >::insert(&account, &who, recovery_status); - Self::deposit_event(Event::::RecoveryInitiated { lost: account, rescuer: who }); + Self::deposit_event(Event::::RecoveryInitiated { + lost_account: account, + rescuer_account: who, + }); Ok(()) } @@ -564,7 +574,11 @@ pub mod pallet { } // Update storage with the latest details >::insert(&lost, &rescuer, active_recovery); - Self::deposit_event(Event::::RecoveryVouched { lost: lost, rescuer: rescuer, sender: who }); + Self::deposit_event(Event::::RecoveryVouched { + lost_account: lost, + rescuer_account: rescuer, + sender: who, + }); Ok(()) } @@ -613,7 +627,10 @@ pub mod pallet { frame_system::Pallet::::inc_consumers(&who).map_err(|_| Error::::BadState)?; // Create the recovery storage item Proxy::::insert(&who, &account); - Self::deposit_event(Event::::AccountRecovered { lost: account, rescuer: who }); + Self::deposit_event(Event::::AccountRecovered { + lost_account: account, + rescuer_account: who, + }); Ok(()) } @@ -652,7 +669,10 @@ pub mod pallet { BalanceStatus::Free, ); debug_assert!(res.is_ok()); - Self::deposit_event(Event::::RecoveryClosed { lost: who, rescuer: rescuer }); + Self::deposit_event(Event::::RecoveryClosed { + lost_account: who, + rescuer_account: rescuer, + }); Ok(()) } @@ -688,7 +708,7 @@ pub mod pallet { // Unreserve the initial deposit for the recovery configuration. T::Currency::unreserve(&who, recovery_config.deposit); - Self::deposit_event(Event::::RecoveryRemoved { account: who }); + Self::deposit_event(Event::::RecoveryRemoved { lost_account: who }); Ok(()) } From 54b3914a55700435707fefbb26d85df3fe83df02 Mon Sep 17 00:00:00 2001 From: doordashcon Date: Sat, 13 Nov 2021 10:16:44 +0000 Subject: [PATCH 7/9] update & cargo +nightly fmt --- frame/session/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs index ef8af9e992535..31d5a280b9845 100644 --- a/frame/session/src/lib.rs +++ b/frame/session/src/lib.rs @@ -533,7 +533,7 @@ pub mod pallet { pub enum Event { /// New session has happened. Note that the argument is the session_index, not the /// block number as the type might suggest. - NewSession { session_index: SessionIndex }, + NewSession { index: SessionIndex }, } /// Old name generated by `decl_event`. @@ -702,7 +702,7 @@ impl Pallet { >::put(next_changed); // Record that this happened. - Self::deposit_event(Event::NewSession { session_index: session_index }); + Self::deposit_event(Event::NewSession { index: session_index }); // Tell everyone about the new session keys. T::SessionHandler::on_new_session::(changed, &session_keys, &queued_amalgamated); From 3c524b5b37414cd22c95b5fa2bbccdca61cd380f Mon Sep 17 00:00:00 2001 From: doordashcon Date: Wed, 17 Nov 2021 08:55:55 +0000 Subject: [PATCH 8/9] update recovery/src/lib.rs --- frame/recovery/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs index 2767acd4aa7a5..c172e7876829e 100644 --- a/frame/recovery/src/lib.rs +++ b/frame/recovery/src/lib.rs @@ -263,7 +263,7 @@ pub mod pallet { #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { /// A recovery process has been set up for an account. - RecoveryCreated { lost_account: T::AccountId }, + RecoveryCreated { account: T::AccountId }, /// A recovery process has been initiated for lost account by rescuer account. RecoveryInitiated { lost_account: T::AccountId, rescuer_account: T::AccountId }, /// A recovery process for lost account by rescuer account has been vouched for by sender. @@ -475,7 +475,7 @@ pub mod pallet { // Create the recovery configuration storage item >::insert(&who, recovery_config); - Self::deposit_event(Event::::RecoveryCreated { lost_account: who }); + Self::deposit_event(Event::::RecoveryCreated { account: who }); Ok(()) } From ae569708f826361d81543ad8b3943c8e802a13af Mon Sep 17 00:00:00 2001 From: doordashcon Date: Fri, 19 Nov 2021 21:08:50 +0000 Subject: [PATCH 9/9] update session/src/lib.rs --- frame/session/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs index 66cd94973f8db..f56d282c0f111 100644 --- a/frame/session/src/lib.rs +++ b/frame/session/src/lib.rs @@ -532,9 +532,9 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { - /// New session has happened. Note that the argument is the session_index, not the + /// New session has happened. Note that the argument is the session index, not the /// block number as the type might suggest. - NewSession { index: SessionIndex }, + NewSession { session_index: SessionIndex }, } /// Old name generated by `decl_event`. @@ -703,7 +703,7 @@ impl Pallet { >::put(next_changed); // Record that this happened. - Self::deposit_event(Event::NewSession { index: session_index }); + Self::deposit_event(Event::NewSession { session_index }); // Tell everyone about the new session keys. T::SessionHandler::on_new_session::(changed, &session_keys, &queued_amalgamated);