Merge pull request #938 from sander2/fix/sudo-migration

fix: properly remove key in the sudo migration

Author: gregdhill

parachain/runtime/interlay/src/lib.rs

@@ -1278,8 +1278,8 @@ struct SudoMigrationCheck;
 
 impl OnRuntimeUpgrade for SudoMigrationCheck {
     fn on_runtime_upgrade() -> Weight {
-        use frame_support::storage::migration::put_storage_value;
-        put_storage_value(b"Sudo", b"Key", &[], Option::<AccountId>::None);
+        use frame_support::storage::migration::take_storage_value;
+        take_storage_value::<AccountId>(b"Sudo", b"Key", &[]);
         Default::default()
     }
     #[cfg(feature = "try-runtime")]

parachain/runtime/kintsugi/src/lib.rs

@@ -1272,8 +1272,8 @@ struct SudoMigrationCheck;
 
 impl OnRuntimeUpgrade for SudoMigrationCheck {
     fn on_runtime_upgrade() -> Weight {
-        use frame_support::storage::migration::put_storage_value;
-        put_storage_value(b"Sudo", b"Key", &[], Option::<AccountId>::None);
+        use frame_support::storage::migration::take_storage_value;
+        take_storage_value::<AccountId>(b"Sudo", b"Key", &[]);
         Default::default()
     }
     #[cfg(feature = "try-runtime")]

standalone/runtime/tests/test_governance.rs

@@ -940,9 +940,9 @@ fn test_sudo_is_disabled_if_key_is_none() {
         })
         .dispatch(origin_of(account_of(ALICE))),);
 
-        use frame_support::storage::migration::put_storage_value;
+        use frame_support::storage::migration::take_storage_value;
         assert!(!pallet_sudo::Pallet::<Runtime>::key().is_none());
-        put_storage_value(b"Sudo", b"Key", &[], Option::<AccountId>::None);
+        take_storage_value::<AccountId>(b"Sudo", b"Key", &[]);
         assert!(pallet_sudo::Pallet::<Runtime>::key().is_none());
 
         // assert that sudo does not work when key is none