import members: cleanup

node/src/chain_spec.rs

@@ -37,8 +37,8 @@ use node_runtime::{
     StorageWorkingGroupConfig, SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, WASM_BINARY,
 };
 
-pub use node_runtime::Moment;
-pub use node_runtime::{genesis_member, AccountId, GenesisConfig};
+// Exported to be used by chain-spec-builder
+pub use node_runtime::{membership, AccountId, GenesisConfig, Moment};
 
 type AccountPublic = <Signature as Verify>::Signer;
 
@@ -205,7 +205,7 @@ pub fn testnet_genesis(
     root_key: AccountId,
     endowed_accounts: Vec<AccountId>,
     cpcp: node_runtime::ProposalsConfigParameters,
-    members: Vec<genesis_member::Member<u64, AccountId, Moment>>,
+    members: Vec<membership::genesis::Member<u64, AccountId, Moment>>,
 ) -> GenesisConfig {
     const CENTS: Balance = 1;
     const DOLLARS: Balance = 100 * CENTS;

runtime-modules/membership/src/genesis.rs

@@ -1,9 +1,19 @@
-// commented out to use in other crates
-// #![cfg(test)]
+#![cfg(feature = "std")]
 
-use crate::genesis_member;
 use crate::{GenesisConfig, Trait};
 use common::currency::BalanceOf;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct Member<MemberId, AccountId, Moment> {
+    pub member_id: MemberId,
+    pub root_account: AccountId,
+    pub controller_account: AccountId,
+    pub handle: String,
+    pub avatar_uri: String,
+    pub about: String,
+    pub registered_at_time: Moment,
+}
 
 /// Builder fo membership module genesis configuration.
 pub struct GenesisConfigBuilder<T: Trait> {
@@ -41,18 +51,16 @@ impl<T: Trait> GenesisConfigBuilder<T> {
                 .members
                 .iter()
                 .enumerate()
-                .map(
-                    |(ix, (ref member_id, ref account_id))| genesis_member::Member {
-                        member_id: *member_id,
-                        root_account: account_id.clone(),
-                        controller_account: account_id.clone(),
-                        // hack to get min handle length to 5
-                        handle: (10000 + ix).to_string(),
-                        avatar_uri: "".into(),
-                        about: "".into(),
-                        registered_at_time: T::Moment::from(0),
-                    },
-                )
+                .map(|(ix, (ref member_id, ref account_id))| Member {
+                    member_id: *member_id,
+                    root_account: account_id.clone(),
+                    controller_account: account_id.clone(),
+                    // hack to get min handle length to 5
+                    handle: (10000 + ix).to_string(),
+                    avatar_uri: "".into(),
+                    about: "".into(),
+                    registered_at_time: T::Moment::from(0),
+                })
                 .collect(),
         }
     }

runtime-modules/membership/src/genesis_member.rs

@@ -1,12 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-pub struct Member<MemberId, AccountId, Moment> {
-    pub member_id: MemberId,
-    pub root_account: AccountId,
-    pub controller_account: AccountId,
-    pub handle: String,
-    pub avatar_uri: String,
-    pub about: String,
-    pub registered_at_time: Moment,
-}

runtime-modules/membership/src/lib.rs

@@ -6,7 +6,6 @@
 #![allow(clippy::redundant_closure_call)]
 
 pub mod genesis;
-pub mod genesis_member;
 pub(crate) mod mock;
 mod tests;
 
@@ -217,7 +216,7 @@ decl_storage! {
     }
     add_extra_genesis {
         config(default_paid_membership_fee): BalanceOf<T>;
-        config(members) : Vec<genesis_member::Member<T::MemberId, T::AccountId, T::Moment>>;
+        config(members) : Vec<genesis::Member<T::MemberId, T::AccountId, T::Moment>>;
         build(|config: &GenesisConfig<T>| {
             for member in &config.members {
                 let checked_user_info = <Module<T>>::check_user_registration_info(

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

@@ -277,7 +277,7 @@ impl ExtBuilder {
 
         membership::GenesisConfig::<Test> {
             default_paid_membership_fee: 0,
-            members: vec![membership::genesis_member::Member {
+            members: vec![membership::genesis::Member {
                 member_id: 0,
                 root_account: 1,
                 controller_account: 1,

runtime/src/lib.rs

@@ -55,7 +55,7 @@ use storage::{data_directory, data_object_storage_registry, data_object_type_reg
 pub use common;
 pub use forum;
 pub use governance::election_params::ElectionParameters;
-pub use membership::genesis_member;
+pub use membership;
 #[cfg(any(feature = "std", test))]
 pub use pallet_balances::Call as BalancesCall;
 pub use pallet_staking::StakerStatus;

utils/chain-spec-builder/src/initial_members.rs

@@ -1,6 +1,6 @@
 use serde_json::Result;
 
-use joystream_node::chain_spec::{genesis_member, AccountId, Moment};
+use joystream_node::chain_spec::{membership, AccountId, Moment};
 use sp_core::crypto::{AccountId32, Ss58Codec};
 
 use serde::{Deserialize, Serialize};
@@ -25,12 +25,12 @@ fn decode_address(address: String) -> AccountId32 {
     AccountId32::from_ss58check(address.as_ref()).expect("failed to decode account id")
 }
 
-pub fn initial_members() -> Vec<genesis_member::Member<u64, AccountId, Moment>> {
+pub fn initial_members() -> Vec<membership::genesis::Member<u64, AccountId, Moment>> {
     let members = parse_members_json().expect("failed parsing members data");
 
     members
         .into_iter()
-        .map(|member| genesis_member::Member {
+        .map(|member| membership::genesis::Member {
             member_id: member.member_id,
             root_account: decode_address(member.root_address.clone()),
             controller_account: decode_address(member.controller_address),