Enhance decl storage (#777)

* enhance macro decl_storage()

* update the state root hash

* fix one comment

substrate/node/executor/src/lib.rs

@@ -249,7 +249,8 @@ mod tests {
 				offline_slash_grace: 0,
 			}),
 			democracy: Some(Default::default()),
-			council: Some(Default::default()),
+			council_seats: Some(Default::default()),
+			council_voting: Some(Default::default()),
 			timestamp: Some(Default::default()),
 			treasury: Some(Default::default()),
 			contract: Some(Default::default()),
@@ -290,9 +291,9 @@ mod tests {
 			1,
 			GENESIS_HASH.into(),
 			if support_changes_trie {
-				hex!("9a7fe864529934ebb5915a855b0270f729803510bc12763c5c6fb87d3e231c17").into()
+				hex!("ffa85ed1832eae3e25e684d4f993ff0b5e8b6ac4d7ba0f40a5fb0114fda22f3d").into()
 			} else {
-				hex!("ee335055cb0c93b108ceed0431129d93b11796ab88d89efe81a29e8c6a1f270f").into()
+				hex!("98971908b8923d07944cdf7ee658c203d17042ef447169adbdfec8160cfabcad").into()
 			},
 			if support_changes_trie {
 				Some(hex!("1f8f44dcae8982350c14dee720d34b147e73279f5a2ce1f9781195a991970978").into())
@@ -316,7 +317,7 @@ mod tests {
 		construct_block(
 			2,
 			block1(false).1,
-			hex!("1db5d091b6efdf41dfd5294aa7a3ceb616fc1e0b95d3ee614f4d4af16e841195").into(),
+			hex!("eef4ca8018e0511f89b7cee1e07796aa710a50accc8b1e52082d05cd8c8b6e24").into(),
 			None,
 			vec![
 				CheckedExtrinsic {
@@ -339,7 +340,7 @@ mod tests {
 		construct_block(
 			1,
 			GENESIS_HASH.into(),
-			hex!("6408d8740fbd31b234032678e9f91608fcccf83b0f900c63d52390dcbcd601a0").into(),
+			hex!("acc03af5b3972deaf9dde4dfd99c5614a5360454313681b6fc299d1644ae8a59").into(),
 			None,
 			vec![
 				CheckedExtrinsic {
@@ -621,7 +622,7 @@ mod tests {
 		let b = construct_block(
 			1,
 			GENESIS_HASH.into(),
-			hex!("062f87b5ba0e96e4a7dcc41afe56a2df7f65a975415a6c1b0e8e92c330124f8f").into(),
+			hex!("21fb6fb965f012ae3c6e521b71b5b57d6df17c738c52f202ec2809ca235eb082").into(),
 			None,
 			vec![
 				CheckedExtrinsic {

substrate/node/runtime/src/lib.rs

@@ -65,6 +65,8 @@ use runtime_primitives::generic;
 use runtime_primitives::traits::{Convert, BlakeTwo256, DigestItem};
 use version::{RuntimeVersion, ApiId};
 use council::{motions as council_motions, voting as council_voting};
+#[cfg(feature = "std")]
+use council::seats as council_seats;
 #[cfg(any(feature = "std", test))]
 use version::NativeVersion;
 
@@ -215,9 +217,10 @@ construct_runtime!(
 		Session: session,
 		Staking: staking,
 		Democracy: democracy,
-		Council: council,
-		CouncilVoting: council_voting::{Module, Call, Storage, Event<T>},
+		Council: council::{Module, Call, Storage, Event<T>},
+		CouncilVoting: council_voting,
 		CouncilMotions: council_motions::{Module, Call, Storage, Event<T>, Origin},
+		CouncilSeats: council_seats::{Config},
 		Treasury: treasury,
 		Contract: contract::{Module, Call, Config, Event<T>},
 	}

substrate/node/runtime/wasm/Cargo.lock

@@ -748,6 +748,7 @@ dependencies = [
  "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 0.1.0",
+ "sr-primitives 0.1.0",
  "sr-std 0.1.0",
  "substrate-metadata 0.1.0",
 ]

substrate/node/service/src/chain_spec.rs

@@ -17,7 +17,7 @@
 //! Substrate chain configurations.
 
 use primitives::{AuthorityId, ed25519};
-use node_runtime::{GenesisConfig, ConsensusConfig, CouncilConfig, DemocracyConfig,
+use node_runtime::{GenesisConfig, ConsensusConfig, CouncilSeatsConfig, CouncilVotingConfig, DemocracyConfig,
 	SessionConfig, StakingConfig, TimestampConfig, BalancesConfig, TreasuryConfig,
 	ContractConfig, Permill, Perbill};
 use service::ChainSpec;
@@ -84,7 +84,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 			voting_period: 5 * MINUTES,	// 3 days to discuss & vote on an active referendum
 			minimum_deposit: 50 * DOLLARS,	// 12000 as the minimum deposit for a referendum
 		}),
-		council: Some(CouncilConfig {
+		council_seats: Some(CouncilSeatsConfig {
 			active_council: vec![],
 			candidacy_bond: 10 * DOLLARS,
 			voter_bond: 1 * DOLLARS,
@@ -96,6 +96,8 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 			desired_seats: 0,
 			inactive_grace_period: 1,	// one additional vote should go by before an inactive voter can be reaped.
 
+		}),
+		council_voting: Some(CouncilVotingConfig {
 			cooloff_period: 4 * DAYS,
 			voting_period: 1 * DAYS,
 		}),
@@ -179,7 +181,7 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
 			voting_period: 18,
 			minimum_deposit: 10,
 		}),
-		council: Some(CouncilConfig {
+		council_seats: Some(CouncilSeatsConfig {
 			active_council: endowed_accounts.iter()
 				.filter(|a| initial_authorities.iter().find(|&b| a.0 == b.0).is_none())
 				.map(|a| (a.clone(), 1000000)).collect(),
@@ -192,7 +194,8 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
 			term_duration: 1000000,
 			desired_seats: (endowed_accounts.len() - initial_authorities.len()) as u32,
 			inactive_grace_period: 1,
-
+		}),
+		council_voting: Some(CouncilVotingConfig {
 			cooloff_period: 75,
 			voting_period: 20,
 		}),