Merge pull request Joystream#1 from mnaamani/integrate-content-wg

Integrate content wg

Cargo.toml

@@ -258,13 +258,13 @@ version = '1.0.4'
 
 [dependencies.forum]
 default_features = false
-git = 'https://github.com/Joystream/substrate-forum-module'
+git = 'https://github.com/joystream/substrate-forum-module'
 package = 'substrate-forum-module'
 rev = '4bdeadaadfcca1fd6e822c520f429d4beacc4c8a'
 
 [dependencies.minting]
 default_features = false
-git = 'https://github.com/Joystream/substrate-token-minting-module/'
+git = 'https://github.com/joystream/substrate-token-minting-module/'
 package = 'substrate-token-mint-module'
 rev = '5570e3b56e9caffa7df1dbede6308b2e6ce18217'
 
@@ -294,6 +294,6 @@ rev = 'd0c68722405355404840512edf3064d5ced3e1fe'
 
 [dependencies.versioned_store_permissions]
 default_features = false
-git = 'https://github.com/mnaamani/substrate-versioned-store-permissions-module'
 package = 'substrate-versioned-store-permissions-module'
-rev = 'a6f60058ce8cc1123e90172807abb22459916727'
+git = 'https://github.com/joystream/substrate-versioned-store-permissions-module'
+rev = '816b796b1b72bba05eebe128cdaa5e18611ac3ae'

src/content_working_group/genesis.rs

@@ -13,7 +13,7 @@ use forum::InputValidationLengthConstraint;
 
 /// Builder of genesis configuration of content working group.
 pub struct GenesisConfigBuilder<T: Trait> {
-    mint: <T as minting::Trait>::MintId,
+    mint_capacity: minting::BalanceOf<T>,
 
     /*
     lead_by_id: GenesisConfigMap<LeadId<T>, Lead<T::AccountId, T::RewardRelationshipId, T::BlockNumber>>,
@@ -65,12 +65,8 @@ impl<T: Trait> GenesisConfigBuilder<T> {
     */
     pub fn build(self) -> GenesisConfig<T> {
         GenesisConfig {
-            mint: self.mint,
-
-            // WE HAVE TO PROVIDE SOME VALUE FOR THESE FOR NOW
-            // USING DEFAULT FOR NOW.
-            lead_by_id: map![], //GenesisConfigMap<LeadId, Lead>,
-            next_lead_id: LeadId::<T>::default(),
+            mint_capacity: self.mint_capacity,
+            initial_lead: None,
             curator_opening_by_id: map![], //GenesisConfigMap<CuratorOpeningId, Opening>,
             next_curator_opening_id: CuratorOpeningId::<T>::default(),
             curator_application_by_id: map![], //GenesisConfigMap<CuratorApplicationId,CuratorApplication>,
@@ -107,7 +103,7 @@ impl<T: Trait> Default for GenesisConfigBuilder<T> {
         };
 
         Self {
-            mint: <T as minting::Trait>::MintId::default(),
+            mint_capacity: minting::BalanceOf::<T>::from(10000),
 
             /*
             current_lead_id: LeadId::<T>::default(), //Option<LeadId>,