fix delegate, remove unneded feature

Brushfam · Jul 28, 2023 · bae858b · bae858b
1 parent a81d53f
commit bae858b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/contracts/src/upgradeability/diamond/diamond.rs b/contracts/src/upgradeability/diamond/diamond.rs
@@ -190,6 +190,7 @@ where
                 .set_tail_call(true),
             )
             .try_invoke()
+            .unwrap_or_else(|err| panic!("delegate call to {:?} failed due to {:?}", delegate_code, err))
             .unwrap_or_else(|err| panic!("delegate call to {:?} failed due to {:?}", delegate_code, err));
         unreachable!("the _fallback call will never return since `tail_call` was set");
     }
@@ -204,6 +205,7 @@ where
             .set_tail_call(true))
             .returns::<()>()
             .try_invoke()
+            .unwrap_or_else(|err| panic!("init call failed due to {:?}", err))
             .unwrap_or_else(|err| panic!("init call failed due to {:?}", err));
         unreachable!("the _init_call call will never return since `tail_call` was set");
     }

diff --git a/contracts/src/upgradeability/proxy/mod.rs b/contracts/src/upgradeability/proxy/mod.rs
@@ -92,6 +92,13 @@ impl<T: Storage<Data>> Internal for T {
                 .set_tail_call(true),
             )
             .try_invoke()
+            .unwrap_or_else(|err| {
+                panic!(
+                    "delegate call to {:?} failed due to {:?}",
+                    self.data().forward_to.clone(),
+                    err
+                )
+            })
             .unwrap_or_else(|err| {
                 panic!(
                     "delegate call to {:?} failed due to {:?}",

diff --git a/examples/psp22_pallet/lib.rs b/examples/psp22_pallet/lib.rs
@@ -1,6 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 #![feature(min_specialization)]
-#![feature(default_alloc_error_handler)]
 
 #[openbrush::contract]
 pub mod my_psp22_pallet {

diff --git a/examples/psp22_pallet_extensions/burnable/lib.rs b/examples/psp22_pallet_extensions/burnable/lib.rs
@@ -1,6 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 #![feature(min_specialization)]
-#![feature(default_alloc_error_handler)]
 
 #[openbrush::contract]
 pub mod my_psp22_pallet_burnable {

diff --git a/examples/psp22_pallet_extensions/metadata/lib.rs b/examples/psp22_pallet_extensions/metadata/lib.rs
@@ -1,6 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 #![feature(min_specialization)]
-#![feature(default_alloc_error_handler)]
 
 #[openbrush::contract]
 pub mod my_psp22_pallet_metadata {

diff --git a/examples/psp22_pallet_extensions/mintable/lib.rs b/examples/psp22_pallet_extensions/mintable/lib.rs
@@ -1,6 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 #![feature(min_specialization)]
-#![feature(default_alloc_error_handler)]
 
 #[openbrush::contract]
 pub mod my_psp22_pallet_mintable {

diff --git a/examples/timelock_controller/lib.rs b/examples/timelock_controller/lib.rs
@@ -1,6 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 #![feature(min_specialization)]
-#![feature(default_alloc_error_handler)]
 
 #[openbrush::contract]
 pub mod my_timelock_controller {