Build fixes

src/lib.rs

@@ -348,7 +348,7 @@ parameter_types! {
 impl staking::Trait for Runtime {
     type Currency = Balances;
     type Time = Timestamp;
-    type CurrencyToVote = currency::CurrencyToVoteHandler;
+    type CurrencyToVote = common::currency::CurrencyToVoteHandler;
     type RewardRemainder = ();
     type Event = Event;
     type Slash = (); // where to send the slashed funds.
@@ -402,7 +402,7 @@ use versioned_store_permissions;
 pub use forum;
 use membership::members;
 
-pub use content_working_group::lib as content_wg;
+pub use content_working_group as content_wg;
 mod migration;
 use hiring;
 use minting;
@@ -560,7 +560,7 @@ impl hiring::Trait for Runtime {
 }
 
 impl minting::Trait for Runtime {
-    type Currency = <Self as currency::GovernanceCurrency>::Currency;
+    type Currency = <Self as common::currency::GovernanceCurrency>::Currency;
     type MintId = u64;
 }
 
@@ -575,7 +575,7 @@ parameter_types! {
 }
 
 impl stake::Trait for Runtime {
-    type Currency = <Self as currency::GovernanceCurrency>::Currency;
+    type Currency = <Self as common::currency::GovernanceCurrency>::Currency;
     type StakePoolId = StakePoolId;
     type StakingEventsHandler = ContentWorkingGroupStakingEventHandler;
     type StakeId = u64;
@@ -653,7 +653,7 @@ impl content_wg::Trait for Runtime {
     type Event = Event;
 }
 
-impl currency::GovernanceCurrency for Runtime {
+impl common::currency::GovernanceCurrency for Runtime {
     type Currency = balances::Module<Self>;
 }
 
@@ -705,7 +705,7 @@ fn random_index(upper_bound: usize) -> usize {
 }
 
 pub struct LookupRoles {}
-impl traits::Roles<Runtime> for LookupRoles {
+impl roles::traits::Roles<Runtime> for LookupRoles {
     fn is_role_account(account_id: &<Runtime as system::Trait>::AccountId) -> bool {
         <actors::Module<Runtime>>::is_role_account(account_id)
     }

src/migration.rs

@@ -1,5 +1,3 @@
-use crate::forum;
-use crate::storage;
 use crate::VERSION;
 use sr_primitives::print;
 use srml_support::{decl_event, decl_module, decl_storage};