Preparing light client structure [v2]

demo/cli/src/lib.rs

@@ -82,56 +82,61 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 
 	// Create client
 	let executor = demo_executor::Executor::new();
-	let mut storage = Default::default();
-	let god_key = hex!["3d866ec8a9190c8343c2fc593d21d8a6d0c5c4763aaab2349de3a6111d64d124"];
-
-	let genesis_config = GenesisConfig {
-		consensus: Some(ConsensusConfig {
-			code: vec![],	// TODO
-			authorities: vec![god_key.clone()],
-		}),
-		system: None,
-//		block_time: 5,			// 5 second block time.
-		session: Some(SessionConfig {
-			validators: vec![god_key.clone()],
-			session_length: 720,	// that's 1 hour per session.
-		}),
-		staking: Some(StakingConfig {
-			current_era: 0,
-			intentions: vec![],
-			transaction_fee: 100,
-			balances: vec![(god_key.clone(), 1u64 << 63)].into_iter().collect(),
-			validator_count: 12,
-			sessions_per_era: 24,	// 24 hours per era.
-			bonding_duration: 90,	// 90 days per bond.
-		}),
-		democracy: Some(DemocracyConfig {
-			launch_period: 120 * 24 * 14,	// 2 weeks per public referendum
-			voting_period: 120 * 24 * 28,	// 4 weeks to discuss & vote on an active referendum
-			minimum_deposit: 1000,	// 1000 as the minimum deposit for a referendum
-		}),
-		council: Some(CouncilConfig {
-			active_council: vec![],
-			candidacy_bond: 1000,	// 1000 to become a council candidate
-			voter_bond: 100,		// 100 down to vote for a candidate
-			present_slash_per_voter: 1,	// slash by 1 per voter for an invalid presentation.
-			carry_count: 24,		// carry over the 24 runners-up to the next council election
-			presentation_duration: 120 * 24,	// one day for presenting winners.
-			approval_voting_period: 7 * 120 * 24,	// one week period between possible council elections.
-			term_duration: 180 * 120 * 24,	// 180 day term duration for the council.
-			desired_seats: 0, // start with no council: we'll raise this once the stake has been dispersed a bit.
-			inactive_grace_period: 1,	// one addition vote should go by before an inactive voter can be reaped.
-
-			cooloff_period: 90 * 120 * 24, // 90 day cooling off period if council member vetoes a proposal.
-			voting_period: 7 * 120 * 24, // 7 day voting period for council members.
-		}),
-	};
-	let prepare_genesis = || {
-		storage = genesis_config.build_externalities();
-		let block = genesis::construct_genesis_block(&storage);
-		(primitives::block::Header::decode(&mut block.header.encode().as_ref()).expect("to_vec() always gives a valid serialisation; qed"), storage.into_iter().collect())
-	};
-	let client = Arc::new(client::new_in_mem(executor, prepare_genesis)?);
+
+	struct GenesisBuilder;
+
+	impl client::GenesisBuilder for GenesisBuilder {
+		fn build(self) -> (primitives::Header, Vec<(Vec<u8>, Vec<u8>)>) {
+			let god_key = hex!["3d866ec8a9190c8343c2fc593d21d8a6d0c5c4763aaab2349de3a6111d64d124"];
+			let genesis_config = GenesisConfig {
+				consensus: Some(ConsensusConfig {
+					code: vec![],	// TODO
+					authorities: vec![god_key.clone()],
+				}),
+				system: None,
+		//		block_time: 5,			// 5 second block time.
+				session: Some(SessionConfig {
+					validators: vec![god_key.clone()],
+					session_length: 720,	// that's 1 hour per session.
+				}),
+				staking: Some(StakingConfig {
+					current_era: 0,
+					intentions: vec![],
+					transaction_fee: 100,
+					balances: vec![(god_key.clone(), 1u64 << 63)].into_iter().collect(),
+					validator_count: 12,
+					sessions_per_era: 24,	// 24 hours per era.
+					bonding_duration: 90,	// 90 days per bond.
+				}),
+				democracy: Some(DemocracyConfig {
+					launch_period: 120 * 24 * 14,	// 2 weeks per public referendum
+					voting_period: 120 * 24 * 28,	// 4 weeks to discuss & vote on an active referendum
+					minimum_deposit: 1000,	// 1000 as the minimum deposit for a referendum
+				}),
+				council: Some(CouncilConfig {
+					active_council: vec![],
+					candidacy_bond: 1000,	// 1000 to become a council candidate
+					voter_bond: 100,		// 100 down to vote for a candidate
+					present_slash_per_voter: 1,	// slash by 1 per voter for an invalid presentation.
+					carry_count: 24,		// carry over the 24 runners-up to the next council election
+					presentation_duration: 120 * 24,	// one day for presenting winners.
+					approval_voting_period: 7 * 120 * 24,	// one week period between possible council elections.
+					term_duration: 180 * 120 * 24,	// 180 day term duration for the council.
+					desired_seats: 0, // start with no council: we'll raise this once the stake has been dispersed a bit.
+					inactive_grace_period: 1,	// one addition vote should go by before an inactive voter can be reaped.
+
+					cooloff_period: 90 * 120 * 24, // 90 day cooling off period if council member vetoes a proposal.
+					voting_period: 7 * 120 * 24, // 7 day voting period for council members.
+				}),
+			};
+
+			let storage = genesis_config.build_externalities();
+			let block = genesis::construct_genesis_block(&storage);
+			(primitives::block::Header::decode(&mut block.header.encode().as_ref()).expect("to_vec() always gives a valid serialisation; qed"), storage.into_iter().collect())
+		}
+	}
+
+	let client = Arc::new(client::new_in_mem(executor, GenesisBuilder)?);
 	let mut core = ::tokio_core::reactor::Core::new().expect("Unable to spawn event loop.");
 
 	let _rpc_servers = {