Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Try-runtime proper return types #2615

Merged
paritytech-processbot merged 3 commits into from
May 23, 2023
Merged

Try-runtime proper return types #2615

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e11bb47
Try-runtime proper return types
Szegoo May 22, 2023
e97a8c4
update
Szegoo May 23, 2023
2f0f4d1
update pallet-xcm
Szegoo May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Try-runtime proper return types
  • Loading branch information
@Szegoo
Szegoo committed May 22, 2023
commit e11bb47c3366229036ff6fe7746e3f058f36e0ea
24 changes: 12 additions & 12 deletions parachains/runtimes/collectives/collectives-polkadot/src/fellowship/migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ pub(crate) mod import_kusama_fellowship {
<T as frame_system::Config>::AccountId: From<[u8; 32]>,
{
#[cfg(feature = "try-runtime")]
fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
let onchain_version = RankedCollective::<T, I>::on_chain_storage_version();
assert_eq!(onchain_version, 0, "the storage version must be 0.");
ensure!(onchain_version == 0, "the storage version must be 0.");
let member_count = MemberCount::<T, I>::get(0);
assert_eq!(member_count, 0, "the collective must be uninitialized.");
ensure!(member_count == 0, "the collective must be uninitialized.");

Ok(Vec::new())
}
Expand Down Expand Up @@ -143,15 +143,15 @@ pub(crate) mod import_kusama_fellowship {
}

#[cfg(feature = "try-runtime")]
fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
assert_eq!(MemberCount::<T, I>::get(0), 47, "invalid members count at rank 0.");
assert_eq!(MemberCount::<T, I>::get(1), 47, "invalid members count at rank 1.");
assert_eq!(MemberCount::<T, I>::get(2), 24, "invalid members count at rank 2.");
assert_eq!(MemberCount::<T, I>::get(3), 17, "invalid members count at rank 3.");
assert_eq!(MemberCount::<T, I>::get(4), 10, "invalid members count at rank 4.");
assert_eq!(MemberCount::<T, I>::get(5), 7, "invalid members count at rank 5.");
assert_eq!(MemberCount::<T, I>::get(6), 3, "invalid members count at rank 6.");
assert_eq!(MemberCount::<T, I>::get(7), 0, "invalid members count at rank 7.");
fn post_upgrade(_state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
ensure!(MemberCount::<T, I>::get(0) == 47, "invalid members count at rank 0.");
ensure!(MemberCount::<T, I>::get(1) == 47, "invalid members count at rank 1.");
ensure!(MemberCount::<T, I>::get(2) == 24, "invalid members count at rank 2.");
ensure!(MemberCount::<T, I>::get(3) == 17, "invalid members count at rank 3.");
ensure!(MemberCount::<T, I>::get(4) == 10, "invalid members count at rank 4.");
ensure!(MemberCount::<T, I>::get(5) == 7, "invalid members count at rank 5.");
ensure!(MemberCount::<T, I>::get(6) == 3, "invalid members count at rank 6.");
ensure!(MemberCount::<T, I>::get(7) == 0, "invalid members count at rank 7.");
Ok(())
}
}
Expand Down