Update macro use and optimize storage collection (#13970)

frame/contracts/src/lib.rs

@@ -83,11 +83,10 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "runtime-benchmarks", recursion_limit = "1024")]
 
-#[macro_use]
-mod gas;
 mod address;
 mod benchmarking;
 mod exec;
+mod gas;
 mod migration;
 mod schedule;
 mod storage;

frame/contracts/src/storage/meter.rs

@@ -290,8 +290,8 @@ where
 			.total_deposit
 			.saturating_add(&absorbed.total_deposit)
 			.saturating_add(&own_deposit);
+		self.charges.extend_from_slice(&absorbed.charges);
 		if !own_deposit.is_zero() {
-			self.charges.extend_from_slice(&absorbed.charges);
 			self.charges.push(Charge {
 				deposit_account,
 				amount: own_deposit,

frame/contracts/src/tests.rs

@@ -72,7 +72,19 @@ frame_support::construct_runtime!(
 	}
 );
 
-#[macro_use]
+macro_rules! assert_return_code {
+	( $x:expr , $y:expr $(,)? ) => {{
+		assert_eq!(u32::from_le_bytes($x.data[..].try_into().unwrap()), $y as u32);
+	}};
+}
+
+macro_rules! assert_refcount {
+	( $code_hash:expr , $should:expr $(,)? ) => {{
+		let is = crate::OwnerInfoOf::<Test>::get($code_hash).map(|m| m.refcount()).unwrap();
+		assert_eq!(is, $should);
+	}};
+}
+
 pub mod test_utils {
 	use super::{Balances, Hash, SysConfig, Test};
 	use crate::{exec::AccountIdOf, CodeHash, Config, ContractInfo, ContractInfoOf, Nonce};
@@ -104,18 +116,6 @@ pub mod test_utils {
 	pub fn hash<S: Encode>(s: &S) -> <<Test as SysConfig>::Hashing as Hash>::Output {
 		<<Test as SysConfig>::Hashing as Hash>::hash_of(s)
 	}
-	macro_rules! assert_return_code {
-		( $x:expr , $y:expr $(,)? ) => {{
-			assert_eq!(u32::from_le_bytes($x.data[..].try_into().unwrap()), $y as u32);
-		}};
-	}
-
-	macro_rules! assert_refcount {
-		( $code_hash:expr , $should:expr $(,)? ) => {{
-			let is = crate::OwnerInfoOf::<Test>::get($code_hash).map(|m| m.refcount()).unwrap();
-			assert_eq!(is, $should);
-		}};
-	}
 }
 
 impl Test {