added new names & fixed tests

runtime-modules/common/src/working_group.rs

@@ -17,11 +17,11 @@ pub enum WorkingGroup {
     /// Storage working group: working_group::Instance3.
     Content,
     /// Operations working group: working_group::Instance4.
-    Operations1,
+    OperationsAlpha,
     /// Operations working group: working_group::Instance6.
-    Operations2,
+    OperationsBeta,
     /// Operations working group: working_group::Instance7.
-    Operations3,
+    OperationsGamma,
     /// Gateway working group: working_group::Instance5.
     Gateway,
 }

runtime/src/integration/proposals/proposal_encoder.rs

@@ -22,14 +22,14 @@ macro_rules! wrap_working_group_call {
                 Call::ContentDirectoryWorkingGroup($working_group_instance_call)
             }
             WorkingGroup::Storage => Call::StorageWorkingGroup($working_group_instance_call),
-            WorkingGroup::Operations1 => {
-                Call::OperationsWorkingGroup1($working_group_instance_call)
+            WorkingGroup::OperationsAlpha => {
+                Call::OperationsWorkingGroupAlpha($working_group_instance_call)
             }
-            WorkingGroup::Operations2 => {
-                Call::OperationsWorkingGroup2($working_group_instance_call)
+            WorkingGroup::OperationsBeta => {
+                Call::OperationsWorkingGroupBeta($working_group_instance_call)
             }
-            WorkingGroup::Operations3 => {
-                Call::OperationsWorkingGroup3($working_group_instance_call)
+            WorkingGroup::OperationsGamma => {
+                Call::OperationsWorkingGroupGamma($working_group_instance_call)
             }
             WorkingGroup::Gateway => Call::GatewayWorkingGroup($working_group_instance_call),
         }

runtime/src/integration/working_group.rs

@@ -3,8 +3,8 @@ use sp_std::marker::PhantomData;
 
 use crate::{
     ContentDirectoryWorkingGroupInstance, GatewayWorkingGroupInstance,
-    OperationsWorkingGroupInstance1, OperationsWorkingGroupInstance2,
-    OperationsWorkingGroupInstance3, StorageWorkingGroupInstance,
+    OperationsWorkingGroupInstanceAlpha, OperationsWorkingGroupInstanceBeta,
+    OperationsWorkingGroupInstanceGamma, StorageWorkingGroupInstance,
 };
 use stake::{BalanceOf, NegativeImbalance};
 
@@ -98,12 +98,12 @@ impl<T: stake::Trait + working_group::Trait<StorageWorkingGroupInstance>>
     }
 }
 
-pub struct OperationsWgStakingEventsHandler1<T> {
+pub struct OperationsWgStakingEventsHandlerAlpha<T> {
     pub marker: PhantomData<T>,
 }
 
-impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstance1>>
-    stake::StakingEventsHandler<T> for OperationsWgStakingEventsHandler1<T>
+impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstanceAlpha>>
+    stake::StakingEventsHandler<T> for OperationsWgStakingEventsHandlerAlpha<T>
 {
     /// Unstake remaining sum back to the source_account_id
     fn unstaked(
@@ -118,10 +118,10 @@ impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstance1>>
 
         let hiring_application_id = hiring::ApplicationIdByStakingId::<T>::get(*stake_id);
 
-        if working_group::MemberIdByHiringApplicationId::<T, OperationsWorkingGroupInstance1>::contains_key(
+        if working_group::MemberIdByHiringApplicationId::<T, OperationsWorkingGroupInstanceAlpha>::contains_key(
             hiring_application_id,
         ) {
-            return <working_group::Module<T, OperationsWorkingGroupInstance1>>::refund_working_group_stake(
+            return <working_group::Module<T, OperationsWorkingGroupInstanceAlpha>>::refund_working_group_stake(
 				*stake_id,
 				remaining_imbalance,
 			);
@@ -186,12 +186,12 @@ impl<T: stake::Trait + working_group::Trait<GatewayWorkingGroupInstance>>
     }
 }
 
-pub struct OperationsWgStakingEventsHandler2<T> {
+pub struct OperationsWgStakingEventsHandlerBeta<T> {
     pub marker: PhantomData<T>,
 }
 
-impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstance2>>
-    stake::StakingEventsHandler<T> for OperationsWgStakingEventsHandler2<T>
+impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstanceBeta>>
+    stake::StakingEventsHandler<T> for OperationsWgStakingEventsHandlerBeta<T>
 {
     /// Unstake remaining sum back to the source_account_id
     fn unstaked(
@@ -206,10 +206,10 @@ impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstance2>>
 
         let hiring_application_id = hiring::ApplicationIdByStakingId::<T>::get(*stake_id);
 
-        if working_group::MemberIdByHiringApplicationId::<T, OperationsWorkingGroupInstance2>::contains_key(
+        if working_group::MemberIdByHiringApplicationId::<T, OperationsWorkingGroupInstanceBeta>::contains_key(
             hiring_application_id,
         ) {
-            return <working_group::Module<T, OperationsWorkingGroupInstance2>>::refund_working_group_stake(
+            return <working_group::Module<T, OperationsWorkingGroupInstanceBeta>>::refund_working_group_stake(
 				*stake_id,
 				remaining_imbalance,
 			);
@@ -230,12 +230,12 @@ impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstance2>>
     }
 }
 
-pub struct OperationsWgStakingEventsHandler3<T> {
+pub struct OperationsWgStakingEventsHandlerGamma<T> {
     pub marker: PhantomData<T>,
 }
 
-impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstance3>>
-    stake::StakingEventsHandler<T> for OperationsWgStakingEventsHandler3<T>
+impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstanceGamma>>
+    stake::StakingEventsHandler<T> for OperationsWgStakingEventsHandlerGamma<T>
 {
     /// Unstake remaining sum back to the source_account_id
     fn unstaked(
@@ -250,10 +250,10 @@ impl<T: stake::Trait + working_group::Trait<OperationsWorkingGroupInstance3>>
 
         let hiring_application_id = hiring::ApplicationIdByStakingId::<T>::get(*stake_id);
 
-        if working_group::MemberIdByHiringApplicationId::<T, OperationsWorkingGroupInstance3>::contains_key(
+        if working_group::MemberIdByHiringApplicationId::<T, OperationsWorkingGroupInstanceGamma>::contains_key(
             hiring_application_id,
         ) {
-            return <working_group::Module<T, OperationsWorkingGroupInstance3>>::refund_working_group_stake(
+            return <working_group::Module<T, OperationsWorkingGroupInstanceGamma>>::refund_working_group_stake(
 				*stake_id,
 				remaining_imbalance,
 			);

runtime/src/lib.rs

@@ -483,10 +483,14 @@ impl stake::Trait for Runtime {
             (
                 (
                     (
-                        crate::integration::working_group::OperationsWgStakingEventsHandler1<Self>,
-                        crate::integration::working_group::OperationsWgStakingEventsHandler2<Self>,
+                        crate::integration::working_group::OperationsWgStakingEventsHandlerAlpha<
+                            Self,
+                        >,
+                        crate::integration::working_group::OperationsWgStakingEventsHandlerBeta<
+                            Self,
+                        >,
                     ),
-                    crate::integration::working_group::OperationsWgStakingEventsHandler3<Self>,
+                    crate::integration::working_group::OperationsWgStakingEventsHandlerGamma<Self>,
                 ),
                 crate::integration::working_group::GatewayWgStakingEventsHandler<Self>,
             ),
@@ -573,16 +577,16 @@ pub type StorageWorkingGroupInstance = working_group::Instance2;
 pub type ContentDirectoryWorkingGroupInstance = working_group::Instance3;
 
 // The builder working group instance alias.
-pub type OperationsWorkingGroupInstance1 = working_group::Instance4;
+pub type OperationsWorkingGroupInstanceAlpha = working_group::Instance4;
 
 // The gateway working group instance alias.
 pub type GatewayWorkingGroupInstance = working_group::Instance5;
 
 // The builder working group instance alias.
-pub type OperationsWorkingGroupInstance2 = working_group::Instance6;
+pub type OperationsWorkingGroupInstanceBeta = working_group::Instance6;
 
 // The builder working group instance alias.
-pub type OperationsWorkingGroupInstance3 = working_group::Instance7;
+pub type OperationsWorkingGroupInstanceGamma = working_group::Instance7;
 
 parameter_types! {
     pub const MaxWorkerNumberLimit: u32 = 100;
@@ -598,7 +602,7 @@ impl working_group::Trait<ContentDirectoryWorkingGroupInstance> for Runtime {
     type MaxWorkerNumberLimit = MaxWorkerNumberLimit;
 }
 
-impl working_group::Trait<OperationsWorkingGroupInstance1> for Runtime {
+impl working_group::Trait<OperationsWorkingGroupInstanceAlpha> for Runtime {
     type Event = Event;
     type MaxWorkerNumberLimit = MaxWorkerNumberLimit;
 }
@@ -608,12 +612,12 @@ impl working_group::Trait<GatewayWorkingGroupInstance> for Runtime {
     type MaxWorkerNumberLimit = MaxWorkerNumberLimit;
 }
 
-impl working_group::Trait<OperationsWorkingGroupInstance2> for Runtime {
+impl working_group::Trait<OperationsWorkingGroupInstanceBeta> for Runtime {
     type Event = Event;
     type MaxWorkerNumberLimit = MaxWorkerNumberLimit;
 }
 
-impl working_group::Trait<OperationsWorkingGroupInstance3> for Runtime {
+impl working_group::Trait<OperationsWorkingGroupInstanceGamma> for Runtime {
     type Event = Event;
     type MaxWorkerNumberLimit = MaxWorkerNumberLimit;
 }
@@ -747,10 +751,10 @@ construct_runtime!(
         // reserved for the future use: ForumWorkingGroup: working_group::<Instance1>::{Module, Call, Storage, Event<T>},
         StorageWorkingGroup: working_group::<Instance2>::{Module, Call, Storage, Config<T>, Event<T>},
         ContentDirectoryWorkingGroup: working_group::<Instance3>::{Module, Call, Storage, Config<T>, Event<T>},
-        OperationsWorkingGroup1: working_group::<Instance4>::{Module, Call, Storage, Config<T>, Event<T>},
+        OperationsWorkingGroupAlpha: working_group::<Instance4>::{Module, Call, Storage, Config<T>, Event<T>},
         GatewayWorkingGroup: working_group::<Instance5>::{Module, Call, Storage, Config<T>, Event<T>},
-        OperationsWorkingGroup2: working_group::<Instance6>::{Module, Call, Storage, Config<T>, Event<T>},
-        OperationsWorkingGroup3: working_group::<Instance7>::{Module, Call, Storage, Config<T>, Event<T>},
+        OperationsWorkingGroupBeta: working_group::<Instance6>::{Module, Call, Storage, Config<T>, Event<T>},
+        OperationsWorkingGroupGamma: working_group::<Instance7>::{Module, Call, Storage, Config<T>, Event<T>},
 
     }
 );

runtime/src/tests/proposals_integration/working_group_proposals.rs

@@ -12,8 +12,10 @@ use working_group::{OpeningPolicyCommitment, RewardPolicy};
 
 use crate::{
     Balance, BlockNumber, ContentDirectoryWorkingGroup, ContentDirectoryWorkingGroupInstance,
-    GatewayWorkingGroup, GatewayWorkingGroupInstance, OperationsWorkingGroup,
-    OperationsWorkingGroupInstance, StorageWorkingGroup, StorageWorkingGroupInstance,
+    GatewayWorkingGroup, GatewayWorkingGroupInstance, OperationsWorkingGroupAlpha,
+    OperationsWorkingGroupBeta, OperationsWorkingGroupGamma, OperationsWorkingGroupInstanceAlpha,
+    OperationsWorkingGroupInstanceBeta, OperationsWorkingGroupInstanceGamma, StorageWorkingGroup,
+    StorageWorkingGroupInstance,
 };
 use sp_std::collections::btree_set::BTreeSet;
 
@@ -53,14 +55,32 @@ fn add_opening(
             >>::contains_key(opening_id));
             opening_id
         }
-        WorkingGroup::Operations => {
-            let opening_id = OperationsWorkingGroup::next_opening_id();
+        WorkingGroup::OperationsAlpha => {
+            let opening_id = OperationsWorkingGroupAlpha::next_opening_id();
             assert!(!<working_group::OpeningById<
                 Runtime,
-                OperationsWorkingGroupInstance,
+                OperationsWorkingGroupInstanceAlpha,
             >>::contains_key(opening_id));
             opening_id
         }
+        WorkingGroup::OperationsBeta => {
+            let opening_id = OperationsWorkingGroupBeta::next_opening_id();
+            assert!(!<working_group::OpeningById<
+                Runtime,
+                OperationsWorkingGroupInstanceBeta,
+            >>::contains_key(opening_id));
+            opening_id
+        }
+
+        WorkingGroup::OperationsGamma => {
+            let opening_id = OperationsWorkingGroupGamma::next_opening_id();
+            assert!(!<working_group::OpeningById<
+                Runtime,
+                OperationsWorkingGroupInstanceGamma,
+            >>::contains_key(opening_id));
+            opening_id
+        }
+
         WorkingGroup::Gateway => {
             let opening_id = GatewayWorkingGroup::next_opening_id();
             assert!(!<working_group::OpeningById<
@@ -347,12 +367,25 @@ fn create_add_working_group_leader_opening_proposal_execution_succeeds() {
                     StorageWorkingGroupInstance,
                 >(group);
             }
-            WorkingGroup::Operations => {
+            WorkingGroup::OperationsAlpha => {
+                run_create_add_working_group_leader_opening_proposal_execution_succeeds::<
+                    Runtime,
+                    OperationsWorkingGroupInstanceAlpha,
+                >(group);
+            }
+            WorkingGroup::OperationsBeta => {
                 run_create_add_working_group_leader_opening_proposal_execution_succeeds::<
                     Runtime,
-                    OperationsWorkingGroupInstance,
+                    OperationsWorkingGroupInstanceBeta,
                 >(group);
             }
+            WorkingGroup::OperationsGamma => {
+                run_create_add_working_group_leader_opening_proposal_execution_succeeds::<
+                    Runtime,
+                    OperationsWorkingGroupInstanceGamma,
+                >(group);
+            }
+
             WorkingGroup::Gateway => {
                 run_create_add_working_group_leader_opening_proposal_execution_succeeds::<
                     Runtime,
@@ -417,12 +450,25 @@ fn create_begin_review_working_group_leader_applications_proposal_execution_succ
                 StorageWorkingGroupInstance,
             >(group);
             }
-            WorkingGroup::Operations => {
+            WorkingGroup::OperationsAlpha => {
                 run_create_begin_review_working_group_leader_applications_proposal_execution_succeeds::<
                 Runtime,
-                OperationsWorkingGroupInstance,
+                OperationsWorkingGroupInstanceAlpha,
             >(group);
             }
+            WorkingGroup::OperationsBeta => {
+                run_create_begin_review_working_group_leader_applications_proposal_execution_succeeds::<
+                Runtime,
+                OperationsWorkingGroupInstanceBeta,
+            >(group);
+            }
+            WorkingGroup::OperationsGamma => {
+                run_create_begin_review_working_group_leader_applications_proposal_execution_succeeds::<
+                Runtime,
+                OperationsWorkingGroupInstanceGamma,
+            >(group);
+            }
+
             WorkingGroup::Gateway => {
                 run_create_begin_review_working_group_leader_applications_proposal_execution_succeeds::<
                 Runtime,
@@ -509,12 +555,25 @@ fn create_fill_working_group_leader_opening_proposal_execution_succeeds() {
                     StorageWorkingGroupInstance,
                 >(group);
             }
-            WorkingGroup::Operations => {
+            WorkingGroup::OperationsAlpha => {
                 run_create_fill_working_group_leader_opening_proposal_execution_succeeds::<
                     Runtime,
-                    OperationsWorkingGroupInstance,
+                    OperationsWorkingGroupInstanceAlpha,
                 >(group);
             }
+            WorkingGroup::OperationsBeta => {
+                run_create_fill_working_group_leader_opening_proposal_execution_succeeds::<
+                    Runtime,
+                    OperationsWorkingGroupInstanceBeta,
+                >(group);
+            }
+            WorkingGroup::OperationsGamma => {
+                run_create_fill_working_group_leader_opening_proposal_execution_succeeds::<
+                    Runtime,
+                    OperationsWorkingGroupInstanceGamma,
+                >(group);
+            }
+
             WorkingGroup::Gateway => {
                 run_create_fill_working_group_leader_opening_proposal_execution_succeeds::<
                     Runtime,
@@ -598,12 +657,25 @@ fn create_fill_working_group_leader_opening_proposal_execution_succeeds() {
                         StorageWorkingGroupInstance,
                     >(group);
                 }
-                WorkingGroup::Operations => {
+                WorkingGroup::OperationsAlpha => {
+                    run_create_decrease_group_leader_stake_proposal_execution_succeeds::<
+                        Runtime,
+                        OperationsWorkingGroupInstanceAlpha,
+                    >(group);
+                }
+                WorkingGroup::OperationsBeta => {
                     run_create_decrease_group_leader_stake_proposal_execution_succeeds::<
                         Runtime,
-                        OperationsWorkingGroupInstance,
+                        OperationsWorkingGroupInstanceBeta,
                     >(group);
                 }
+                WorkingGroup::OperationsGamma => {
+                    run_create_decrease_group_leader_stake_proposal_execution_succeeds::<
+                        Runtime,
+                        OperationsWorkingGroupInstanceGamma,
+                    >(group);
+                }
+
                 WorkingGroup::Gateway => {
                     run_create_decrease_group_leader_stake_proposal_execution_succeeds::<
                         Runtime,
@@ -727,10 +799,22 @@ fn create_fill_working_group_leader_opening_proposal_execution_succeeds() {
                         StorageWorkingGroupInstance,
                     >(group)
                 }
-                WorkingGroup::Operations => {
+                WorkingGroup::OperationsAlpha => {
+                    run_create_slash_group_leader_stake_proposal_execution_succeeds::<
+                        Runtime,
+                        OperationsWorkingGroupInstanceAlpha,
+                    >(group)
+                }
+                WorkingGroup::OperationsBeta => {
+                    run_create_slash_group_leader_stake_proposal_execution_succeeds::<
+                        Runtime,
+                        OperationsWorkingGroupInstanceBeta,
+                    >(group)
+                }
+                WorkingGroup::OperationsGamma => {
                     run_create_slash_group_leader_stake_proposal_execution_succeeds::<
                         Runtime,
-                        OperationsWorkingGroupInstance,
+                        OperationsWorkingGroupInstanceGamma,
                     >(group)
                 }
                 WorkingGroup::Gateway => {
@@ -857,12 +941,25 @@ fn create_fill_working_group_leader_opening_proposal_execution_succeeds() {
                         StorageWorkingGroupInstance,
                     >(group);
                 }
-                WorkingGroup::Operations => {
-                    run_create_set_working_group_mint_capacity_proposal_execution_succeeds::<
+                WorkingGroup::OperationsAlpha => {
+                    run_create_slash_group_leader_stake_proposal_execution_succeeds::<
                         Runtime,
-                        OperationsWorkingGroupInstance,
-                    >(group);
+                        OperationsWorkingGroupInstanceAlpha,
+                    >(group)
                 }
+                WorkingGroup::OperationsBeta => {
+                    run_create_slash_group_leader_stake_proposal_execution_succeeds::<
+                        Runtime,
+                        OperationsWorkingGroupInstanceBeta,
+                    >(group)
+                }
+                WorkingGroup::OperationsGamma => {
+                    run_create_slash_group_leader_stake_proposal_execution_succeeds::<
+                        Runtime,
+                        OperationsWorkingGroupInstanceGamma,
+                    >(group)
+                }
+
                 WorkingGroup::Gateway => {
                     run_create_set_working_group_mint_capacity_proposal_execution_succeeds::<
                         Runtime,
@@ -925,11 +1022,23 @@ fn create_fill_working_group_leader_opening_proposal_execution_succeeds() {
                             StorageWorkingGroupInstance,
                         >(group);
                     }
-                    WorkingGroup::Operations => {
-                        run_create_set_working_group_mint_capacity_proposal_execution_succeeds::<
+                    WorkingGroup::OperationsAlpha => {
+                        run_create_slash_group_leader_stake_proposal_execution_succeeds::<
                             Runtime,
-                            OperationsWorkingGroupInstance,
-                        >(group);
+                            OperationsWorkingGroupInstanceAlpha,
+                        >(group)
+                    }
+                    WorkingGroup::OperationsBeta => {
+                        run_create_slash_group_leader_stake_proposal_execution_succeeds::<
+                            Runtime,
+                            OperationsWorkingGroupInstanceBeta,
+                        >(group)
+                    }
+                    WorkingGroup::OperationsGamma => {
+                        run_create_slash_group_leader_stake_proposal_execution_succeeds::<
+                            Runtime,
+                            OperationsWorkingGroupInstanceGamma,
+                        >(group)
                     }
                     WorkingGroup::Gateway => {
                         run_create_set_working_group_mint_capacity_proposal_execution_succeeds::<
@@ -1060,12 +1169,25 @@ fn create_fill_working_group_leader_opening_proposal_execution_succeeds() {
                             StorageWorkingGroupInstance,
                         >(group);
                     }
-                    WorkingGroup::Operations => {
-                        run_create_terminate_group_leader_role_proposal_execution_succeeds::<
+                    WorkingGroup::OperationsAlpha => {
+                        run_create_slash_group_leader_stake_proposal_execution_succeeds::<
                             Runtime,
-                            OperationsWorkingGroupInstance,
-                        >(group);
+                            OperationsWorkingGroupInstanceAlpha,
+                        >(group)
+                    }
+                    WorkingGroup::OperationsBeta => {
+                        run_create_slash_group_leader_stake_proposal_execution_succeeds::<
+                            Runtime,
+                            OperationsWorkingGroupInstanceBeta,
+                        >(group)
+                    }
+                    WorkingGroup::OperationsGamma => {
+                        run_create_slash_group_leader_stake_proposal_execution_succeeds::<
+                            Runtime,
+                            OperationsWorkingGroupInstanceGamma,
+                        >(group)
                     }
+
                     WorkingGroup::Gateway => {
                         run_create_terminate_group_leader_role_proposal_execution_succeeds::<
                             Runtime,
@@ -1191,9 +1313,17 @@ fn create_fill_working_group_leader_opening_proposal_execution_succeeds() {
                     WorkingGroup::Storage => {
                         run_create_terminate_group_leader_role_proposal_with_slashing_execution_succeeds::<Runtime, StorageWorkingGroupInstance>(group);
                     }
-                    WorkingGroup::Operations => {
-                        run_create_terminate_group_leader_role_proposal_with_slashing_execution_succeeds::<Runtime, OperationsWorkingGroupInstance>(group);
+
+                    WorkingGroup::OperationsAlpha => {
+                        run_create_terminate_group_leader_role_proposal_with_slashing_execution_succeeds::<Runtime, OperationsWorkingGroupInstanceAlpha>(group);
+                    }
+                    WorkingGroup::OperationsBeta => {
+                        run_create_terminate_group_leader_role_proposal_with_slashing_execution_succeeds::<Runtime, OperationsWorkingGroupInstanceBeta>(group);
                     }
+                    WorkingGroup::OperationsGamma => {
+                        run_create_terminate_group_leader_role_proposal_with_slashing_execution_succeeds::<Runtime, OperationsWorkingGroupInstanceGamma>(group);
+                    }
+
                     WorkingGroup::Gateway => {
                         run_create_terminate_group_leader_role_proposal_with_slashing_execution_succeeds::<Runtime, GatewayWorkingGroupInstance>(group);
                     }