Update and allow switching independent to shared profile (#452)

* Update and allow switching independent - profile * fix: benchmarking.rs errors * fix: jobs/benchmarking.rs errors * fix: jobs/benchmarking.rs errors * Break tests up to individual cases, add active profile switching tests
tangle-network · Jan 30, 2024 · 60990ee · 60990ee
1 parent 420c8eb
commit 60990ee
Show file tree

Hide file tree

Showing 12 changed files with 507 additions and 59 deletions.
diff --git a/pallets/jobs/src/benchmarking.rs b/pallets/jobs/src/benchmarking.rs
@@ -21,7 +21,8 @@ benchmarks! {
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		let job =  JobSubmissionOf::<T> {
 			expiry: 100u32.into(),
-			job_type: JobType::DKGTSSPhaseOne(DKGTSSPhaseOneJobType { participants: vec![caller.clone(), caller.clone()], threshold: 1, permitted_caller: None, role_type : ThresholdSignatureRoleType::TssGG20  }),
+			ttl: 100u32.into(),
+			job_type: JobType::DKGTSSPhaseOne(DKGTSSPhaseOneJobType { participants: vec![caller.clone(), caller.clone()], threshold: 1, permitted_caller: None, role_type : Default::default()  }),
 		};
 
 	}: _(RawOrigin::Signed(caller.clone()), job.clone())
@@ -33,10 +34,11 @@ benchmarks! {
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		let job =  JobSubmissionOf::<T> {
 			expiry: 100u32.into(),
-			job_type: JobType::DKGTSSPhaseOne(DKGTSSPhaseOneJobType { participants: vec![caller.clone(), validator2], threshold: 1, permitted_caller: None, role_type : ThresholdSignatureRoleType::TssGG20 }),
+			ttl: 100u32.into(),
+			job_type: JobType::DKGTSSPhaseOne(DKGTSSPhaseOneJobType { participants: vec![caller.clone(), validator2], threshold: 1, permitted_caller: None, role_type : Default::default() }),
 		};
 		let _ = Pallet::<T>::submit_job(RawOrigin::Signed(caller.clone()).into(), job);
-		let job_key: RoleType = RoleType::Tss(ThresholdSignatureRoleType::TssGG20);
+		let job_key: RoleType = RoleType::Tss(Default::default());
 		let job_id: JobId = 0;
 		let result = JobResult::DKGPhaseOne(DKGTSSKeySubmissionResult {
 			signatures: vec![],
@@ -64,10 +66,11 @@ benchmarks! {
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		let job =  JobSubmissionOf::<T> {
 			expiry: 100u32.into(),
-			job_type: JobType::DKGTSSPhaseOne(DKGTSSPhaseOneJobType { participants: vec![caller.clone(), validator2, validator3], threshold: 2, permitted_caller: None, role_type : ThresholdSignatureRoleType::TssGG20 }),
-			};
+			ttl: 100u32.into(),
+			job_type: JobType::DKGTSSPhaseOne(DKGTSSPhaseOneJobType { participants: vec![caller.clone(), validator2, validator3], threshold: 2, permitted_caller: None, role_type : Default::default() }),
+		};
 		let _ = Pallet::<T>::submit_job(RawOrigin::Signed(caller.clone()).into(), job);
-		let job_key: RoleType = RoleType::Tss(ThresholdSignatureRoleType::TssGG20);
+		let job_key: RoleType = RoleType::Tss(Default::default());
 		let job_id: JobId = 0;
 	}: _(RawOrigin::Signed(caller.clone()), job_key.clone(), job_id.clone(), caller.clone(), ValidatorOffenceType::Inactivity, vec![])
 }

diff --git a/pallets/jobs/src/mock.rs b/pallets/jobs/src/mock.rs
@@ -180,10 +180,10 @@ impl pallet_session::historical::Config for Runtime {
 pub struct BaseFilter;
 impl Contains<RuntimeCall> for BaseFilter {
 	fn contains(call: &RuntimeCall) -> bool {
-		let is_stake_unbound_call =
+		let is_stake_unbond_call =
 			matches!(call, RuntimeCall::Staking(pallet_staking::Call::unbond { .. }));
 
-		if is_stake_unbound_call {
+		if is_stake_unbond_call {
 			// no unbond call
 			return false
 		}