From 7cac582edd52f7b0a019567a1922ca8a0eff47a7 Mon Sep 17 00:00:00 2001 From: gui Date: Wed, 28 Aug 2024 11:06:10 +0900 Subject: [PATCH 1/3] refactor verbose test --- .../src/migrations/v1/tests.rs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs b/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs index 838ba29a62124..05387248577cb 100644 --- a/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs +++ b/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs @@ -29,6 +29,7 @@ use crate::{ }; use frame_support::traits::OnRuntimeUpgrade; use pallet_migrations::WeightInfo as _; +use codec::Decode; #[test] fn lazy_migration_works() { @@ -51,10 +52,21 @@ fn lazy_migration_works() { let mut last_decodable = 0; for block in 2..=65 { run_to_block(block); + let mut decodable = 0; for i in 0..1024 { - if crate::MyMap::::get(i).is_some() { + let key = crate::MyMap::::hashed_key_for(i); + let value = frame_support::storage::unhashed::get_raw(&key[..]) + .expect("value exists"); + + if let Ok(value) = u64::decode(&mut &value[..]) { + assert_eq!(value, i as u64); decodable += 1; + } else { + assert_eq!( + u32::decode(&mut &value[..]).expect("not migrated yet"), + i as u32 + ); } } From 5a21f2661708c2ba232bdba6a0bf46b53daeb69c Mon Sep 17 00:00:00 2001 From: gui Date: Wed, 28 Aug 2024 11:24:05 +0900 Subject: [PATCH 2/3] fmt --- .../multi-block-migrations/src/migrations/v1/tests.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs b/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs index 05387248577cb..c70a4f17f79be 100644 --- a/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs +++ b/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs @@ -27,9 +27,9 @@ use crate::{ System, }, }; +use codec::Decode; use frame_support::traits::OnRuntimeUpgrade; use pallet_migrations::WeightInfo as _; -use codec::Decode; #[test] fn lazy_migration_works() { @@ -56,17 +56,14 @@ fn lazy_migration_works() { let mut decodable = 0; for i in 0..1024 { let key = crate::MyMap::::hashed_key_for(i); - let value = frame_support::storage::unhashed::get_raw(&key[..]) - .expect("value exists"); + let value = + frame_support::storage::unhashed::get_raw(&key[..]).expect("value exists"); if let Ok(value) = u64::decode(&mut &value[..]) { assert_eq!(value, i as u64); decodable += 1; } else { - assert_eq!( - u32::decode(&mut &value[..]).expect("not migrated yet"), - i as u32 - ); + assert_eq!(u32::decode(&mut &value[..]).expect("not migrated yet"), i as u32); } } From 7ad822d128423e567b1b1cc0578edb832fd8b053 Mon Sep 17 00:00:00 2001 From: gui Date: Wed, 28 Aug 2024 11:29:53 +0900 Subject: [PATCH 3/3] fix clippy --- .../examples/multi-block-migrations/src/migrations/v1/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs b/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs index c70a4f17f79be..3d2360d63a732 100644 --- a/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs +++ b/substrate/frame/examples/multi-block-migrations/src/migrations/v1/tests.rs @@ -63,7 +63,7 @@ fn lazy_migration_works() { assert_eq!(value, i as u64); decodable += 1; } else { - assert_eq!(u32::decode(&mut &value[..]).expect("not migrated yet"), i as u32); + assert_eq!(u32::decode(&mut &value[..]).expect("not migrated yet"), i); } }