node: refactor chain_spec

node/src/initial_members.rs → node/src/chain_spec/initial_members.rs

@@ -1,4 +1,4 @@
-use super::chain_spec::{membership, AccountId, Moment};
+use node_runtime::{membership, AccountId, Moment};
 use std::{fs, path::Path};
 
 pub fn from_json(data_file: &Path) -> Vec<membership::genesis::Member<u64, AccountId, Moment>> {

node/src/chain_spec.rs → node/src/chain_spec/mod.rs

@@ -40,6 +40,10 @@ use node_runtime::{
 // Exported to be used by chain-spec-builder
 pub use node_runtime::{membership, AccountId, ForumConfig, GenesisConfig, Moment};
 
+pub mod forum_config;
+pub mod initial_members;
+pub mod proposals_config;
+
 type AccountPublic = <Signature as Verify>::Signer;
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
@@ -127,11 +131,9 @@ impl Alternative {
                             get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
                             get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
                         ],
-                        crate::proposals_config::development(),
-                        crate::initial_members::none(),
-                        crate::forum_config::empty(get_account_id_from_seed::<sr25519::Public>(
-                            "Alice",
-                        )),
+                        proposals_config::development(),
+                        initial_members::none(),
+                        forum_config::empty(get_account_id_from_seed::<sr25519::Public>("Alice")),
                     )
                 },
                 Vec::new(),
@@ -165,11 +167,9 @@ impl Alternative {
                             get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
                             get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
                         ],
-                        crate::proposals_config::development(),
-                        crate::initial_members::none(),
-                        crate::forum_config::empty(get_account_id_from_seed::<sr25519::Public>(
-                            "Alice",
-                        )),
+                        proposals_config::development(),
+                        initial_members::none(),
+                        forum_config::empty(get_account_id_from_seed::<sr25519::Public>("Alice")),
                     )
                 },
                 Vec::new(),

node/src/lib.rs

@@ -1,8 +1,5 @@
 pub mod chain_spec;
 pub mod cli;
-pub mod forum_config;
-pub mod initial_members;
-pub mod proposals_config;
 #[macro_use]
 pub mod service;
 pub mod command;

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

@@ -23,10 +23,10 @@ use ansi_term::Style;
 use rand::{distributions::Alphanumeric, rngs::OsRng, Rng};
 use structopt::StructOpt;
 
-use joystream_node::{
-    chain_spec::{self, chain_spec_properties, AccountId},
-    forum_config, initial_members, proposals_config,
+use joystream_node::chain_spec::{
+    self, chain_spec_properties, forum_config, initial_members, proposals_config, AccountId,
 };
+
 use sc_chain_spec::ChainType;
 use sc_keystore::Store as Keystore;
 use sc_telemetry::TelemetryEndpoints;