Fix modules dependencies

runtime-modules/common/Cargo.toml

@@ -17,16 +17,16 @@ std = [
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

runtime-modules/common/src/lib.rs

@@ -1,5 +1,4 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub mod currency;
-pub mod traits;
+pub mod currency;

runtime-modules/content-working-group/Cargo.toml

@@ -15,6 +15,13 @@ std = [
     'primitives/std',
     'rstd/std',
     'membership/std',
+    'forum/std',
+    'hiring/std',
+    'stake/std',
+    'minting/std',
+    'versioned_store/std',
+    'versioned_store_permissions/std',
+    'recurringrewards/std',
 ]
 
 
@@ -22,19 +29,19 @@ std = [
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.rstd]
 default_features = false
@@ -59,6 +66,48 @@ features = ['derive']
 package = 'parity-scale-codec'
 version = '1.0.0'
 
+[dependencies.forum]
+default_features = false
+package = 'substrate-forum-module'
+git = 'https://github.com/joystream/substrate-forum-module'
+tag = 'v1.1.0'
+
+[dependencies.minting]
+default_features = false
+package = 'substrate-token-mint-module'
+git = 'https://github.com/joystream/substrate-token-minting-module/'
+tag = 'v1.0.0'
+
+[dependencies.stake]
+default_features = false
+package = 'substrate-stake-module'
+git = 'https://github.com/Joystream/substrate-stake-module/'
+tag = 'v1.0.0'
+
+[dependencies.recurringrewards]
+default_features = false
+package = 'substrate-recurring-reward-module'
+git = 'https://github.com/Joystream/substrate-recurring-reward-module'
+tag = 'v1.0.0'
+
+[dependencies.hiring]
+default_features = false
+package = 'substrate-hiring-module'
+git = 'https://github.com/Joystream/substrate-hiring-module'
+tag = 'v1.0.0'
+
+[dependencies.versioned_store]
+default_features = false
+package ='substrate-versioned-store'
+git = 'https://github.com/joystream/substrate-versioned-store-module'
+tag = 'v1.0.0'
+
+[dependencies.versioned_store_permissions]
+default_features = false
+package = 'substrate-versioned-store-permissions-module'
+git = 'https://github.com/joystream/substrate-versioned-store-permissions-module'
+tag = 'v1.0.0'
+
 [dependencies.membership]
 default_features = false
 package = 'substrate-membership-module'

runtime-modules/content-working-group/src/lib.rs

@@ -7,9 +7,6 @@ use serde::{Deserialize, Serialize};
 use codec::{Decode, Encode}; // Codec
                              //use rstd::collections::btree_map::BTreeMap;
 use membership::{members, role_types};
-use hiring;
-use minting;
-use recurringrewards;
 use rstd::collections::btree_map::BTreeMap;
 use rstd::collections::btree_set::BTreeSet;
 use rstd::convert::From;
@@ -23,9 +20,7 @@ use srml_support::{
     dispatch, // , StorageMap, , Parameter
     ensure,
 };
-use stake;
 use system::{self, ensure_root, ensure_signed};
-use versioned_store_permissions;
 
 /// DIRTY IMPORT BECAUSE
 /// InputValidationLengthConstraint has not been factored out yet!!!
@@ -792,7 +787,7 @@ struct WrappedBeginAcceptingApplicationsError { // can this be made generic, or
 }
 */
 
-pub(super) struct WrappedError<E> {
+pub struct WrappedError<E> {
     // can this be made generic, or does that undermine the whole orhpan rule spirit?
     pub error: E,
 }

runtime-modules/governance/Cargo.toml

@@ -12,6 +12,7 @@ std = [
 	'system/std',
 	'serde',
 	'codec/std',
+	'timestamp/std',
 	'primitives/std',
 	'rstd/std',
 	'common/std',
@@ -22,19 +23,19 @@ std = [
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.rstd]
 default_features = false
@@ -47,6 +48,12 @@ features = ['derive']
 optional = true
 version = '1.0.101'
 
+[dependencies.timestamp]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'srml-timestamp'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
 [dependencies.primitives]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'

runtime-modules/membership/Cargo.toml

@@ -12,6 +12,7 @@ std = [
 	'system/std',
 	'rstd/std',
 	'codec/std',
+	'serde',
 	'timestamp/std',
 	'primitives/std',
 	'common/std',
@@ -21,19 +22,19 @@ std = [
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.rstd]
 default_features = false
@@ -47,6 +48,11 @@ features = ['derive']
 package = 'parity-scale-codec'
 version = '1.0.0'
 
+[dependencies.serde]
+features = ['derive']
+optional = true
+version = '1.0.101'
+
 [dependencies.timestamp]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'

runtime-modules/memo/Cargo.toml

@@ -12,6 +12,8 @@ std = [
 	'srml-support/std',
 	'system/std',
 	'rstd/std',
+	'codec/std',
+	'serde',
 	'common/std',
 ]
 
@@ -19,19 +21,19 @@ std = [
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.rstd]
 default_features = false
@@ -39,6 +41,17 @@ git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-std'
 rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
+[dependencies.codec]
+default-features = false
+features = ['derive']
+package = 'parity-scale-codec'
+version = '1.0.0'
+
+[dependencies.serde]
+features = ['derive']
+optional = true
+version = '1.0.101'
+
 [dependencies.common]
 default_features = false
 package = 'substrate-common-module'

runtime-modules/roles/Cargo.toml

@@ -12,6 +12,7 @@ std = [
 	'system/std',
 	'rstd/std',
 	'codec/std',
+	'serde',
 	'primitives/std',
 	'common/std',
 	'membership/std',
@@ -22,19 +23,19 @@ std = [
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.rstd]
 default_features = false
@@ -48,6 +49,11 @@ features = ['derive']
 package = 'parity-scale-codec'
 version = '1.0.0'
 
+[dependencies.serde]
+features = ['derive']
+optional = true
+version = '1.0.101'
+
 [dependencies.primitives]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'

runtime-modules/service-discovery/Cargo.toml

@@ -21,19 +21,19 @@ std = [
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.rstd]
 default_features = false

runtime-modules/storage/Cargo.toml

@@ -12,6 +12,8 @@ std = [
 	'system/std',
 	'rstd/std',
 	'codec/std',
+	'timestamp/std',
+	'serde',
 	'primitives/std',
 	'common/std',
 	'membership/std',
@@ -23,19 +25,19 @@ std = [
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.rstd]
 default_features = false
@@ -49,12 +51,23 @@ features = ['derive']
 package = 'parity-scale-codec'
 version = '1.0.0'
 
+[dependencies.serde]
+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.timestamp]
+default_features = false
+git = 'https://github.com/paritytech/substrate.git'
+package = 'srml-timestamp'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
+
 [dependencies.membership]
 default_features = false
 package = 'substrate-membership-module'

runtime-modules/storage/src/data_object_storage_registry.rs

@@ -1,6 +1,7 @@
 use roles::actors;
 use crate::data_directory::Trait as DDTrait;
-use crate::traits::{ContentHasStorage, ContentIdExists, Roles};
+use crate::traits::{ContentHasStorage, ContentIdExists};
+use roles::traits::{ Roles};
 use codec::{Codec, Decode, Encode};
 use rstd::prelude::*;
 use sr_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};

runtime-modules/storage/src/traits.rs

@@ -1,5 +1,4 @@
 use crate::{data_directory, data_object_storage_registry, data_object_type_registry};
-use system;
 
 // Storage
 pub trait IsActiveDataObjectType<T: data_object_type_registry::Trait> {