Fix modules tests

Cargo.lock

@@ -3595,7 +3595,6 @@ dependencies = [
  "srml-system",
  "substrate-common-module",
  "substrate-membership-module",
- "substrate-primitives",
 ]
 
 [[package]]

runtime-modules/governance/Cargo.toml

@@ -74,4 +74,16 @@ path = '../common'
 [dependencies.membership]
 default_features = false
 package = 'substrate-membership-module'
-path = '../membership'
+path = '../membership'
+
+[dev-dependencies.runtime-io]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'sr-io'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
+[dev-dependencies.balances]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'srml-balances'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

runtime-modules/governance/src/council.rs

@@ -123,7 +123,7 @@ decl_module! {
 
 #[cfg(test)]
 mod tests {
-    use crate::governance::mock::*;
+    use crate::mock::*;
     use srml_support::*;
 
     fn add_council_member_as_root(account: <Test as system::Trait>::AccountId) -> dispatch::Result {

runtime-modules/governance/src/election.rs

@@ -898,7 +898,7 @@ impl<T: Trait> council::CouncilTermEnded for Module<T> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::governance::mock::*;
+    use crate::mock::*;
     use codec::Encode;
     use srml_support::*;
 

runtime-modules/governance/src/proposals.rs

@@ -687,10 +687,11 @@ mod tests {
             .build_storage::<Test>()
             .unwrap();
 
-        // We use default for brevity, but you can configure as desired if needed.
-        balances::GenesisConfig::<Test>::default()
-            .assimilate_storage(&mut t)
-            .unwrap();
+        // balances doesn't contain GenesisConfig anymore
+        // // We use default for brevity, but you can configure as desired if needed.
+        // balances::GenesisConfig::<Test>::default()
+        //     .assimilate_storage(&mut t)
+        //     .unwrap();
 
         let council_mock: council::Seats<u64, u64> = ALL_COUNCILORS
             .iter()

runtime-modules/membership/Cargo.toml

@@ -68,4 +68,16 @@ rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 [dependencies.common]
 default_features = false
 package = 'substrate-common-module'
-path = '../common'
+path = '../common'
+
+[dev-dependencies.runtime-io]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'sr-io'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
+[dev-dependencies.balances]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'srml-balances'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

runtime-modules/roles/Cargo.toml

@@ -13,7 +13,6 @@ std = [
 	'rstd/std',
 	'codec/std',
 	'serde',
-	'primitives/std',
 	'common/std',
 	'membership/std',
 ]
@@ -54,12 +53,6 @@ features = ['derive']
 optional = true
 version = '1.0.101'
 
-[dependencies.primitives]
-default_features = false
-git = 'https://github.com/paritytech/substrate.git'
-package = 'substrate-primitives'
-rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-
 [dependencies.membership]
 default_features = false
 package = 'substrate-membership-module'
@@ -69,3 +62,27 @@ path = '../membership'
 default_features = false
 package = 'substrate-common-module'
 path = '../common'
+
+[dev-dependencies.runtime-io]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'sr-io'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
+[dev-dependencies.balances]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'srml-balances'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
+[dev-dependencies.timestamp]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'srml-timestamp'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
+[dev-dependencies.primitives]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'substrate-primitives'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

runtime-modules/service-discovery/Cargo.toml

@@ -58,6 +58,12 @@ features = ['derive']
 package = 'parity-scale-codec'
 version = '1.0.0'
 
+[dev-dependencies.runtime-io]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'sr-io'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
 [dependencies.roles]
 default_features = false
 package = 'substrate-roles-module'

runtime-modules/service-discovery/src/mock.rs

@@ -1,7 +1,7 @@
 #![cfg(test)]
 
 pub use super::discovery;
-pub use crate::roles::actors;
+pub use roles::actors;
 use roles::traits::Roles;
 
 pub use primitives::{Blake2Hasher, H256};

runtime-modules/storage/Cargo.toml

@@ -82,3 +82,15 @@ path = '../common'
 default_features = false
 package = 'substrate-roles-module'
 path = '../roles'
+
+[dev-dependencies.runtime-io]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'sr-io'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
+[dev-dependencies.balances]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'srml-balances'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

runtime-modules/storage/src/data_directory.rs

@@ -236,7 +236,7 @@ impl<T: Trait> Module<T> {
 
 #[cfg(test)]
 mod tests {
-    use crate::storage::mock::*;
+    use crate::mock::*;
 
     #[test]
     fn succeed_adding_content() {

runtime-modules/storage/src/data_object_storage_registry.rs

@@ -198,7 +198,7 @@ impl<T: Trait> Module<T> {
 
 #[cfg(test)]
 mod tests {
-    use crate::storage::mock::*;
+    use crate::mock::*;
 
     #[test]
     fn initial_state() {

runtime-modules/storage/src/data_object_type_registry.rs

@@ -157,7 +157,7 @@ impl<T: Trait> Module<T> {
 #[cfg(test)]
 mod tests {
     //use super::*;
-    use crate::storage::mock::*;
+    use crate::mock::*;
 
     use system::{self, EventRecord, Phase};
 

runtime-modules/storage/src/mock.rs

@@ -41,7 +41,7 @@ pub const TEST_MOCK_LIAISON: u64 = 0xd00du64;
 pub const TEST_MOCK_EXISTING_CID: u64 = 42;
 
 pub struct MockRoles {}
-impl traits::Roles<Test> for MockRoles {
+impl roles::traits::Roles<Test> for MockRoles {
     fn is_role_account(_account_id: &<Test as system::Trait>::AccountId) -> bool {
         false
     }