benchmarks: fix compilation after rebase

runtime-modules/membership/src/tests/mock.rs

@@ -2,9 +2,7 @@
 
 pub use crate::{GenesisConfig, Trait};
 
-use crate::MembershipWorkingGroupInstance;
 pub use frame_support::traits::{Currency, LockIdentifier};
-use frame_support::weights::Weight;
 use frame_support::{impl_outer_event, impl_outer_origin, parameter_types};
 
 pub use frame_system;
@@ -16,7 +14,7 @@ use sp_runtime::{
     DispatchError, DispatchResult, Perbill,
 };
 
-type MembershipWorkingGroupInstance = working_group::Instance4;
+pub(crate) type MembershipWorkingGroupInstance = working_group::Instance4;
 
 pub use common::currency::GovernanceCurrency;
 
@@ -108,8 +106,7 @@ parameter_types! {
     pub const LockId: LockIdentifier = [9; 8];
 }
 
-pub struct WorkingGroupWeightInfo;
-impl working_group::Trait<crate::MembershipWorkingGroupInstance> for Test {
+impl working_group::Trait<MembershipWorkingGroupInstance> for Test {
     type Event = TestEvent;
     type MaxWorkerNumberLimit = MaxWorkerNumberLimit;
     type StakingHandler = staking_handler::StakingManager<Self, LockId>;

runtime-modules/membership/src/tests/mod.rs

@@ -4,7 +4,7 @@ pub(crate) mod fixtures;
 pub(crate) mod mock;
 
 use super::genesis;
-use crate::{Error, Event, MembershipWorkingGroupInstance};
+use crate::{Error, Event};
 use fixtures::*;
 use mock::*;
 

runtime-modules/working-group/Cargo.toml

@@ -20,11 +20,11 @@ staking-handler = { package = 'staking-handler', default-features = false, path
 frame-benchmarking = { package = 'frame-benchmarking', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca', optional = true}
 membership = { package = 'pallet-membership', default-features = false, path = '../membership', optional = true}
 
-
 [dev-dependencies]
 sp-io = { package = 'sp-io', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
 sp-core = { package = 'sp-core', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
 pallet-timestamp = { package = 'pallet-timestamp', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
+membership = { package = 'pallet-membership', default-features = false, path = '../membership'}
 
 [features]
 default = ['std']

runtime-modules/working-group/src/tests/mock.rs

@@ -24,6 +24,7 @@ impl_outer_event! {
         balances<T>,
         crate DefaultInstance <T>,
         frame_system<T>,
+        membership<T>,
     }
 }
 
@@ -95,6 +96,12 @@ impl common::Trait for Test {
     type ActorId = u64;
 }
 
+impl membership::Trait for Test {
+    type Event = TestEvent;
+    type MembershipFee = MembershipFee;
+    type WorkingGroup = Module<Test>;
+}
+
 pub type Balances = balances::Module<Test>;
 pub type System = frame_system::Module<Test>;