git.delta.rocks / unique-network / refs/commits / ff6d0176d1b5

difftreelog

Merge pull request #770 from UniqueNetwork/fix/disable-scheduler-v2-everywhere

ut-akuznetsov2022-12-14parents: #cfd2000 #d41c81b.patch.diff
in: master

4 files changed

modifiedruntime/common/construct_runtime/mod.rsdiffbeforeafterboth
--- a/runtime/common/construct_runtime/mod.rs
+++ b/runtime/common/construct_runtime/mod.rs
@@ -57,8 +57,8 @@
                 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
                 Unique: pallet_unique::{Pallet, Call, Storage} = 61,
 
-                #[runtimes(opal)]
-                Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,
+                // #[runtimes(opal)]
+                // Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,
 
                 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,
 
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -179,7 +179,6 @@
 limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
 opal-runtime = [
     'refungible',
-    'scheduler',
     'rmrk',
     'app-promotion',
     'foreign-assets',
modifiedtest-pallets/utils/src/lib.rsdiffbeforeafterboth
--- a/test-pallets/utils/src/lib.rs
+++ b/test-pallets/utils/src/lib.rs
@@ -29,10 +29,10 @@
 	};
 	use frame_system::pallet_prelude::*;
 	use sp_std::vec::Vec;
-	use pallet_unique_scheduler_v2::{TaskName, Pallet as SchedulerPallet};
+	// use pallet_unique_scheduler_v2::{TaskName, Pallet as SchedulerPallet};
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_unique_scheduler_v2::Config {
+	pub trait Config: frame_system::Config /*+ pallet_unique_scheduler_v2::Config*/ {
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// The overarching call type.
@@ -108,21 +108,21 @@
 			Self::set_test_value(origin, <TestValue<T>>::get() + 1)
 		}
 
-		#[pallet::weight(10_000)]
-		pub fn self_canceling_inc(
-			origin: OriginFor<T>,
-			id: TaskName,
-			max_test_value: u32,
-		) -> DispatchResult {
-			Self::ensure_origin_and_enabled(origin.clone())?;
-			Self::inc_test_value(origin.clone())?;
+		// #[pallet::weight(10_000)]
+		// pub fn self_canceling_inc(
+		// 	origin: OriginFor<T>,
+		// 	id: TaskName,
+		// 	max_test_value: u32,
+		// ) -> DispatchResult {
+		// 	Self::ensure_origin_and_enabled(origin.clone())?;
+		// 	Self::inc_test_value(origin.clone())?;
 
-			if <TestValue<T>>::get() == max_test_value {
-				SchedulerPallet::<T>::cancel_named(origin, id)?;
-			}
+		// 	if <TestValue<T>>::get() == max_test_value {
+		// 		SchedulerPallet::<T>::cancel_named(origin, id)?;
+		// 	}
 
-			Ok(())
-		}
+		// 	Ok(())
+		// }
 
 		#[pallet::weight(100_000_000)]
 		pub fn just_take_fee(origin: OriginFor<T>) -> DispatchResult {
modifiedtests/src/pallet-presence.test.tsdiffbeforeafterboth
63 const chain = await helper.callRpc('api.rpc.system.chain', []);63 const chain = await helper.callRpc('api.rpc.system.chain', []);
6464
65 const refungible = 'refungible';65 const refungible = 'refungible';
66 const scheduler = 'scheduler';
67 const foreignAssets = 'foreignassets';66 const foreignAssets = 'foreignassets';
68 const rmrkPallets = ['rmrkcore', 'rmrkequip'];67 const rmrkPallets = ['rmrkcore', 'rmrkequip'];
69 const appPromotion = 'apppromotion';68 const appPromotion = 'apppromotion';
72 if (chain.eq('OPAL by UNIQUE')) {71 if (chain.eq('OPAL by UNIQUE')) {
73 requiredPallets.push(72 requiredPallets.push(
74 refungible,73 refungible,
75 // scheduler,
76 foreignAssets,74 foreignAssets,
77 appPromotion,75 appPromotion,
78 testUtils,76 testUtils,
79 scheduler,
80 ...rmrkPallets,77 ...rmrkPallets,
81 );78 );
82 } else if (chain.eq('QUARTZ by UNIQUE')) {79 } else if (chain.eq('QUARTZ by UNIQUE')) {