From b7c0116387a25cf252da506c9e30db569d45e3d2 Mon Sep 17 00:00:00 2001 From: Dmitry Lavrenov Date: Sat, 8 Feb 2025 01:25:11 +0300 Subject: [PATCH 1/2] Avoid using get_or_insert_default --- frame/evm-system/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frame/evm-system/src/lib.rs b/frame/evm-system/src/lib.rs index 78cb897c9d..9ab08cdc6b 100644 --- a/frame/evm-system/src/lib.rs +++ b/frame/evm-system/src/lib.rs @@ -147,9 +147,11 @@ impl Pallet { let is_new_account = Account::::mutate_exists(who, |maybe_account| { let is_new_account = maybe_account.is_none(); - let account = maybe_account.get_or_insert_default(); + let mut account = maybe_account.take().unwrap_or_default(); account.nonce += ::Index::one(); + *maybe_account = Some(account); + is_new_account }); From 8e70f8f85315ac18f96e05c365f3ac3dc6406605 Mon Sep 17 00:00:00 2001 From: Dmitry Lavrenov Date: Sat, 8 Feb 2025 11:00:32 +0300 Subject: [PATCH 2/2] Use get_or_insert_with --- frame/evm-system/src/lib.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frame/evm-system/src/lib.rs b/frame/evm-system/src/lib.rs index 9ab08cdc6b..71ea6c7197 100644 --- a/frame/evm-system/src/lib.rs +++ b/frame/evm-system/src/lib.rs @@ -147,11 +147,9 @@ impl Pallet { let is_new_account = Account::::mutate_exists(who, |maybe_account| { let is_new_account = maybe_account.is_none(); - let mut account = maybe_account.take().unwrap_or_default(); + let account = maybe_account.get_or_insert_with(Default::default); account.nonce += ::Index::one(); - *maybe_account = Some(account); - is_new_account });