merge from develop

.travis.yml

@@ -6,24 +6,24 @@ language: minimal
 cache: cargo
 
 branches:
-	only:
-		- master
-		- develop
+    only:
+        - master
+        - develop
 
 env:
-	global:
-		- RUST_BACKTRACE=1
-	matrix:
-		- RUST_TOOLCHAIN=nightly TARGET=wasm
-		- RUST_TOOLCHAIN=nightly TARGET=native
+    global:
+        - RUST_BACKTRACE=1
+    matrix:
+        - RUST_TOOLCHAIN=nightly TARGET=wasm
+        - RUST_TOOLCHAIN=nightly TARGET=native
 
 before_install:
-	# Check how much space we've got on this machine.
-	- df -h
+    # Check how much space we've got on this machine.
+    - df -h
 
 script:
-	- ./ci/script.sh
+    - ./ci/script.sh
 
 after_script:
-	# Check how much free disk space left after the build
-	- df -h
+    # Check how much free disk space left after the build
+    - df -h

README.adoc

@@ -4,7 +4,7 @@
 :toc:
 :sectnums:
 
-image:https://travis-ci.org/AurevoirXavier/darwinia.svg[Build Status (Travis CI),link=https://travis-ci.org/AurevoirXavier/darwinia]
+image:https://travis-ci.org/darwinia-network/darwinia.svg[Build Status (Travis CI),link=https://travis-ci.org/darwinia-network/darwinia]
 image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[License,link=https://opensource.org/licenses/Apache-2.0]
 
 == Darwinia Relay Chain

node/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "node-cli"
-version = "0.4.0"
+version = "0.4.6"
 authors = ["Darwinia Network <[email protected]>"]
 description = "Darwinia node implementation in Rust."
 build = "build.rs"

node/cli/src/chain_spec.rs

@@ -54,7 +54,7 @@ pub struct Extensions {
 pub type ChainSpec = substrate_service::ChainSpec<GenesisConfig, Extensions>;
 
 /// IceFrog testnet generator
-pub fn icefrog_fir_config() -> Result<ChainSpec, String> {
+pub fn icefrog_testnet_config() -> Result<ChainSpec, String> {
 	ChainSpec::from_json_bytes(&include_bytes!("../res/icefrog.json")[..])
 }
 
@@ -308,34 +308,8 @@ pub fn development_config() -> ChainSpec {
 	)
 }
 
-/// Local testnet config (multivalidator Alice + Bob)
+/// IceFrog local testnet config (multivalidator Alice + Bob)
 pub fn local_testnet_config() -> ChainSpec {
-	fn local_testnet_genesis() -> GenesisConfig {
-		darwinia_genesis(
-			vec![
-				get_authority_keys_from_seed("Alice"),
-				get_authority_keys_from_seed("Bob"),
-			],
-			get_account_id_from_seed::<sr25519::Public>("Alice"),
-			None,
-			false,
-		)
-	}
-
-	ChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		local_testnet_genesis,
-		vec![],
-		None,
-		None,
-		None,
-		Default::default(),
-	)
-}
-
-/// IceFrog testnet config (multivalidator Alice + Bob)
-pub fn icefrog_testnet_config() -> ChainSpec {
 	fn icefrog_config_genesis() -> GenesisConfig {
 		darwinia_genesis(
 			vec![

node/cli/src/lib.rs

@@ -55,7 +55,7 @@ impl ChainSpec {
 			ChainSpec::Development => chain_spec::development_config(),
 			ChainSpec::LocalTestnet => chain_spec::local_testnet_config(),
 			ChainSpec::StagingTestnet => chain_spec::staging_testnet_config(),
-			ChainSpec::IceFrogTestnet => chain_spec::icefrog_testnet_config(),
+			ChainSpec::IceFrogTestnet => chain_spec::icefrog_testnet_config()?,
 		})
 	}
 

srml/staking/src/inflation.rs

@@ -1,7 +1,7 @@
 use rstd::convert::TryInto;
 use sr_primitives::{
 	traits::{IntegerSquareRoot, SaturatedConversion},
-	Perbill,
+	Perbill, Perquintill,
 };
 use substrate_primitives::U256;
 
@@ -20,7 +20,7 @@ pub fn compute_total_payout<T: Trait>(
 
 	let year: u32 = (living_time / MILLISECONDS_PER_YEAR + 1).saturated_into::<u32>();
 
-	let portion = Perbill::from_rational_approximation(era_duration, MILLISECONDS_PER_YEAR);
+	let portion = Perquintill::from_rational_approximation(era_duration, MILLISECONDS_PER_YEAR);
 
 	let maximum = portion * total_left;
 

srml/staking/src/mock.rs

@@ -480,15 +480,14 @@ pub fn start_era(era_index: EraIndex) {
 	assert_eq!(Staking::current_era(), era_index);
 }
 
-// TODO
+
 pub fn current_total_payout_for_duration(duration: u64) -> Balance {
-	//	inflation::compute_total_payout(
-	//		era_duration.saturated_into::<Moment>(),
-	//		(<Module<Test>>::Time::now() - <Module<Test>>::GenesisTime::get()).saturated_into::<Moment>(),
-	//		(<Module<Test>>::Cap::get() - Ring::total_issuance()).saturated_into::<Balance>(),
-	//	)
-	//	.0
-	unimplemented!()
+	inflation::compute_total_payout::<Test>(
+		duration.saturated_into::<Moment>(), 
+		(Timestamp::now() - <mock::Test as Trait>::GenesisTime::get()).saturated_into::<Moment>(),
+		(<mock::Test as Trait>::Cap::get() - Ring::total_issuance()).saturated_into::<Balance>(),
+		Perbill::from_percent(50)
+	).0
 }
 
 pub fn reward_all_elected() {