From 27b7c0a770ea449e5463f565270a40000de1f416 Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Fri, 17 Jun 2022 13:53:57 -0400 Subject: [PATCH 1/5] add test for storage sizes --- bin/node/runtime/src/lib.rs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 6f3df7416681e..362fc10db59c8 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -2161,4 +2161,32 @@ mod tests { size, ); } + + #[test] + fn check_pallet_storage_sizes() { + use frame_support::traits::StorageInfoTrait; + let mut storage_info = AllPalletsWithSystem::storage_info(); + println!("| Pallet | Storage | Max Values | Max Size |"); + println!("| --- | --- | --- | --- |"); + + storage_info.sort_by_key(|k| k.max_size); + storage_info.reverse(); + + let mut test_pass = true; + + for info in storage_info { + let pallet_name = String::from_utf8(info.pallet_name).unwrap(); + let storage_name = String::from_utf8(info.storage_name).unwrap(); + println!("| {:?} | {:?} | {:?} | {:?} |", pallet_name, storage_name, info.max_values, info.max_size); + + if let Some(size) = info.max_size { + // We set the limit for storage size at 4MB + if (size > 4 * 1024 * 1024) { + test_pass = false; + } + } + } + + assert!(test_pass); + } } From 934f055f470a7431f2b9597d939d3e7bed2e248a Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 17 Jun 2022 21:49:27 +0200 Subject: [PATCH 2/5] Print how many pallets failed Signed-off-by: Oliver Tale-Yazdi --- bin/node/runtime/src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 4b000367945d4..07d97aba6ff28 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -2177,7 +2177,7 @@ mod tests { storage_info.sort_by_key(|k| k.max_size); storage_info.reverse(); - let mut test_pass = true; + let mut failed = 0; for info in storage_info { let pallet_name = String::from_utf8(info.pallet_name).unwrap(); @@ -2186,12 +2186,12 @@ mod tests { if let Some(size) = info.max_size { // We set the limit for storage size at 4MB - if (size > 4 * 1024 * 1024) { - test_pass = false; + if size > 4 * 1024 * 1024 { + failed += 1; } } } - assert!(test_pass); + assert!(failed == 0, "{} pallets have too big storage", failed); } } From 001075bbef631d0747a289d2d8463f3e203d062b Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 17 Jun 2022 21:50:09 +0200 Subject: [PATCH 3/5] fmt Signed-off-by: Oliver Tale-Yazdi --- bin/node/runtime/src/lib.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 07d97aba6ff28..983c03aaae695 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -2182,7 +2182,10 @@ mod tests { for info in storage_info { let pallet_name = String::from_utf8(info.pallet_name).unwrap(); let storage_name = String::from_utf8(info.storage_name).unwrap(); - println!("| {:?} | {:?} | {:?} | {:?} |", pallet_name, storage_name, info.max_values, info.max_size); + println!( + "| {:?} | {:?} | {:?} | {:?} |", + pallet_name, storage_name, info.max_values, info.max_size + ); if let Some(size) = info.max_size { // We set the limit for storage size at 4MB From 778814ba28a08ac5355dc23f71fefdf01f9d38dc Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Tue, 21 Jun 2022 18:46:42 -0400 Subject: [PATCH 4/5] better formatting Co-authored-by: Sebastian Kunert --- bin/node/runtime/src/lib.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 983c03aaae695..b23a4ca9b4d69 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -2171,8 +2171,11 @@ mod tests { fn check_pallet_storage_sizes() { use frame_support::traits::StorageInfoTrait; let mut storage_info = AllPalletsWithSystem::storage_info(); - println!("| Pallet | Storage | Max Values | Max Size |"); - println!("| --- | --- | --- | --- |"); + println!( + "| {:^30} | {:^30} | {:^10} | {:^15} |", + "Pallet", "Storage", "Max Values", "Max Size" + ); + println!("| {:-<30} | {:-<30} | {:-<10} | {:-<15} |", "", "", "", ""); storage_info.sort_by_key(|k| k.max_size); storage_info.reverse(); @@ -2182,9 +2185,12 @@ mod tests { for info in storage_info { let pallet_name = String::from_utf8(info.pallet_name).unwrap(); let storage_name = String::from_utf8(info.storage_name).unwrap(); - println!( - "| {:?} | {:?} | {:?} | {:?} |", - pallet_name, storage_name, info.max_values, info.max_size + println!( + "| {:<30} | {:<30} | {:<10} | {:<15} |", + pallet_name, + storage_name, + format!("{:?}", info.max_values), + format!("{:?}", info.max_size) ); if let Some(size) = info.max_size { From 211a31f1d1a53b54ef5fe3eb389bdefdca92a655 Mon Sep 17 00:00:00 2001 From: command-bot <> Date: Thu, 16 Mar 2023 12:54:15 +0000 Subject: [PATCH 5/5] ".git/.scripts/commands/fmt/fmt.sh" --- bin/node/runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 7c17b3b0e4ea1..56fb6e0f17ca2 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -2511,7 +2511,7 @@ mod tests { for info in storage_info { let pallet_name = String::from_utf8(info.pallet_name).unwrap(); let storage_name = String::from_utf8(info.storage_name).unwrap(); - println!( + println!( "| {:<30} | {:<30} | {:<10} | {:<15} |", pallet_name, storage_name,