cargo clippy

chainflip-io · Oct 26, 2023 · 3d19b3f · 3d19b3f
1 parent 8ab0e26
commit 3d19b3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/state-chain/pallets/cf-vaults/src/lib.rs b/state-chain/pallets/cf-vaults/src/lib.rs
@@ -339,12 +339,12 @@ pub mod pallet {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
+		fn pre_upgrade() -> Result<Vec<u8>, DispatchError> {
 			migrations::PalletMigration::<T, I>::pre_upgrade()
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(state: Vec<u8>) -> Result<(), &'static str> {
+		fn post_upgrade(state: Vec<u8>) -> Result<(), DispatchError> {
 			migrations::PalletMigration::<T, I>::post_upgrade(state)
 		}
 	}

diff --git a/state-chain/pallets/cf-vaults/src/migrations/v2.rs b/state-chain/pallets/cf-vaults/src/migrations/v2.rs
@@ -34,13 +34,13 @@ impl<T: Config<I>, I: 'static> OnRuntimeUpgrade for Migration<T, I> {
 	#[cfg(feature = "try-runtime")]
 	fn pre_upgrade() -> Result<Vec<u8>, DispatchError> {
 		// just check that the old storage item existed
-		Ok(KeygenSlashRate::<T, I>::exists().encode())
+		Ok(old::KeygenSlashRate::<T, I>::exists().encode())
 	}
 
 	#[cfg(feature = "try-runtime")]
 	fn post_upgrade(state: Vec<u8>) -> Result<(), DispatchError> {
-		if <bool>::decode(&mut &_state[..]).map_err(|_| "Failed to decode pre-upgrade state.")? {
-			assert!(!KeygenSlashRate::<T, I>::exist());
+		if <bool>::decode(&mut &state[..]).map_err(|_| "Failed to decode pre-upgrade state.")? {
+			assert!(!old::KeygenSlashRate::<T, I>::exists());
 			assert!(KeygenSlashAmount::<T, I>::exists());
 			assert!(KeygenSlashAmount::<T, I>::get() == FLIPPERINOS_PER_FLIP)
 		}