Fix error type in try-runtime code

humanode-network · Nov 4, 2024 · 4638b9c · 4638b9c
1 parent 38cd651
commit 4638b9c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/crates/pallet-dummy-precompiles-code/src/upgrade_init.rs b/crates/pallet-dummy-precompiles-code/src/upgrade_init.rs
@@ -1,13 +1,13 @@
 //! Upgrade init implementation.
 
-#[cfg(feature = "try-runtime")]
-use frame_support::{sp_runtime::TryRuntimeError, sp_std::vec::Vec, traits::GetStorageVersion};
 use frame_support::{
     sp_std,
     sp_tracing::info,
     traits::{Get, OnRuntimeUpgrade},
     weights::Weight,
 };
+#[cfg(feature = "try-runtime")]
+use frame_support::{sp_std::vec::Vec, traits::GetStorageVersion};
 
 use crate::{
     Config, LastExecutionVersion, LastForceExecuteAskCounter, Pallet, CURRENT_EXECUTION_VERSION,
@@ -41,13 +41,13 @@ impl<T: Config> OnRuntimeUpgrade for UpgradeInit<T> {
     }
 
     #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+    fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
         // Do nothing.
         Ok(Vec::new())
     }
 
     #[cfg(feature = "try-runtime")]
-    fn post_upgrade(_state: Vec<u8>) -> Result<(), TryRuntimeError> {
+    fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
         use crate::DUMMY_CODE;
 
         let mut not_created_precompiles = Vec::new();
@@ -60,9 +60,7 @@ impl<T: Config> OnRuntimeUpgrade for UpgradeInit<T> {
         }
 
         if !not_created_precompiles.is_empty() {
-            return Err(TryRuntimeError::Other(
-                "precompiles not created properly: {:not_created_precompiles}",
-            ));
+            return Err("precompiles not created properly: {:not_created_precompiles}");
         }
 
         assert_eq!(

diff --git a/crates/pallet-erc20-support/src/migrations/v1.rs b/crates/pallet-erc20-support/src/migrations/v1.rs
@@ -1,17 +1,14 @@
 //! Migration to Version 1.
 
+#[cfg(feature = "try-runtime")]
+use frame_support::sp_std::{vec, vec::Vec};
 use frame_support::{
     pallet_prelude::*,
     sp_std,
     sp_tracing::info,
     traits::{Get, OnRuntimeUpgrade},
     weights::Weight,
 };
-#[cfg(feature = "try-runtime")]
-use frame_support::{
-    sp_runtime::TryRuntimeError,
-    sp_std::{vec, vec::Vec},
-};
 
 use crate::{Approvals, BalanceOf, Config, Pallet};
 
@@ -24,12 +21,12 @@ impl<T: Config<I>, I: 'static> OnRuntimeUpgrade for MigrationToV1<T, I> {
     }
 
     #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+    fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
         Ok(vec![])
     }
 
     #[cfg(feature = "try-runtime")]
-    fn post_upgrade(_state: Vec<u8>) -> Result<(), TryRuntimeError> {
+    fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
         ensure!(
             <Pallet<T, I>>::on_chain_storage_version() == <Pallet<T, I>>::current_storage_version(),
             "the current storage version and onchain storage version should be the same"

diff --git a/crates/pallet-humanode-session/src/migrations/v1.rs b/crates/pallet-humanode-session/src/migrations/v1.rs
@@ -1,5 +1,7 @@
 //! Migration to Version 1.
 
+#[cfg(feature = "try-runtime")]
+use frame_support::sp_std::{vec, vec::Vec};
 use frame_support::{
     pallet_prelude::*,
     sp_std,
@@ -8,11 +10,6 @@ use frame_support::{
     traits::{Get, OnRuntimeUpgrade},
     weights::Weight,
 };
-#[cfg(feature = "try-runtime")]
-use frame_support::{
-    sp_runtime::TryRuntimeError,
-    sp_std::{vec, vec::Vec},
-};
 
 use crate::{Config, CurrentSessionIndex, IdentificationFor, Pallet, SessionIdentities};
 
@@ -25,12 +22,12 @@ impl<T: Config> OnRuntimeUpgrade for MigrationToV1<T> {
     }
 
     #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+    fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
         Ok(pre_migrate::<T>())
     }
 
     #[cfg(feature = "try-runtime")]
-    fn post_upgrade(state: Vec<u8>) -> Result<(), TryRuntimeError> {
+    fn post_upgrade(state: Vec<u8>) -> Result<(), &'static str> {
         post_migrate::<T>(state);
         Ok(())
     }