Separate out staking module into balances and payment

Cargo.toml

@@ -19,6 +19,7 @@ members = [
 	"substrate/runtime-sandbox",
 	"substrate/runtime-std",
 	"substrate/runtime-support",
+	"substrate/runtime/balances",
 	"substrate/runtime/consensus",
 	"substrate/runtime/contract",
 	"substrate/runtime/council",

demo/cli/src/lib.rs

@@ -50,8 +50,8 @@ pub mod error;
 use std::sync::Arc;
 use demo_primitives::{AccountId, Hash};
 use demo_runtime::{Block, BlockId, GenesisConfig,
-	ConsensusConfig, CouncilConfig, DemocracyConfig, SessionConfig, StakingConfig,
-	TimestampConfig};
+	BalancesConfig, ConsensusConfig, CouncilConfig, DemocracyConfig, SessionConfig,
+	StakingConfig, TimestampConfig};
 use futures::{Future, Sink, Stream};
 use tokio::runtime::Runtime;
 use demo_executor::NativeExecutor;
@@ -164,24 +164,26 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 			authorities: vec![god_key.clone().into()],
 		}),
 		system: None,
-		session: Some(SessionConfig {
-			validators: vec![god_key.clone().into()],
-			session_length: 720,	// that's 1 hour per session.
-		}),
-		staking: Some(StakingConfig {
-			current_era: 0,
-			intentions: vec![],
+		balances: Some(BalancesConfig {
 			transaction_base_fee: 100,
 			transaction_byte_fee: 1,
 			transfer_fee: 0,
 			creation_fee: 0,
 			reclaim_rebate: 0,
 			existential_deposit: 500,
 			balances: vec![(god_key.clone().into(), 1u64 << 63)].into_iter().collect(),
+		}),
+		session: Some(SessionConfig {
+			validators: vec![god_key.clone().into()],
+			session_length: 720,	// that's 1 hour per session.
+		}),
+		staking: Some(StakingConfig {
+			current_era: 0,
+			intentions: vec![],
 			validator_count: 12,
 			minimum_validator_count: 4,
 			sessions_per_era: 24,	// 24 hours per era.
-			bonding_duration: 90,	// 90 days per bond.
+			bonding_duration: 90 * 24 * 720,	// 90 days per bond.
 			early_era_slash: 10000,
 			session_reward: 100,
 			offline_slash_grace: 0,

demo/executor/Cargo.toml

@@ -20,6 +20,7 @@ demo-runtime = { path = "../runtime" }
 [dev-dependencies]
 substrate-keyring = { path = "../../substrate/keyring" }
 substrate-runtime-primitives = { path = "../../substrate/runtime/primitives" }
+substrate-runtime-balances = { path = "../../substrate/runtime/balances" }
 substrate-runtime-session = { path = "../../substrate/runtime/session" }
 substrate-runtime-staking = { path = "../../substrate/runtime/staking" }
 substrate-runtime-system = { path = "../../substrate/runtime/system" }