Merge pull request #155 from AurevoirXavier/develop

Develop
darwinia-network · Dec 11, 2019 · e0fdd25 · e0fdd25
2 parents 8804585 + c32bf22
commit e0fdd25
Show file tree

Hide file tree

Showing 27 changed files with 3,243 additions and 870 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/cli/src/lib.rs b/core/cli/src/lib.rs
@@ -1022,7 +1022,7 @@ mod tests {
 	#[test]
 	fn test_node_key_config_input() {
 		fn secret_input(net_config_dir: Option<String>) -> error::Result<()> {
-			NodeKeyType::variants().into_iter().try_for_each(|t| {
+			NodeKeyType::variants().iter().try_for_each(|t| {
 				let node_key_type = NodeKeyType::from_str(t).unwrap();
 				let sk = match node_key_type {
 					NodeKeyType::Ed25519 => ed25519::SecretKey::generate().as_ref().to_vec(),
@@ -1050,7 +1050,7 @@ mod tests {
 	#[test]
 	fn test_node_key_config_file() {
 		fn secret_file(net_config_dir: Option<String>) -> error::Result<()> {
-			NodeKeyType::variants().into_iter().try_for_each(|t| {
+			NodeKeyType::variants().iter().try_for_each(|t| {
 				let node_key_type = NodeKeyType::from_str(t).unwrap();
 				let tmp = TempDir::new("alice")?;
 				let file = tmp.path().join(format!("{}_mysecret", t)).to_path_buf();
@@ -1080,7 +1080,7 @@ mod tests {
 		where
 			F: Fn(NodeKeyParams) -> error::Result<()>,
 		{
-			NodeKeyType::variants().into_iter().try_for_each(|t| {
+			NodeKeyType::variants().iter().try_for_each(|t| {
 				let node_key_type = NodeKeyType::from_str(t).unwrap();
 				f(NodeKeyParams {
 					node_key_type,

diff --git a/core/merkle-patricia-trie/src/lib.rs b/core/merkle-patricia-trie/src/lib.rs
@@ -44,10 +44,9 @@ where
 {
 	let memdb = Rc::new(MemoryDB::new());
 	let mut trie = MerklePatriciaTrie::new(memdb.clone());
-	data.into_iter().for_each(|(key, value)| {
-		// TODO  the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `core::ops::Try`)
-		trie.insert(key.as_ref().to_vec(), value.as_ref().to_vec());
-	});
+	for (k, v) in data {
+		trie.insert(k.as_ref().to_vec(), v.as_ref().to_vec())?;
+	}
 	trie.root()?;
 	Ok(trie)
 }

diff --git a/core/merkle-patricia-trie/src/tests.rs b/core/merkle-patricia-trie/src/tests.rs
@@ -1,13 +1,14 @@
 #[cfg(test)]
 mod trie_tests {
+	use std::rc::Rc;
+
 	use hex::FromHex;
 	use rand::Rng;
-	use std::rc::Rc;
+	use rlp::{self};
 
 	use crate::db::MemoryDB;
 	use crate::proof::Proof;
 	use crate::trie::*;
-	use rlp::{self, Rlp};
 
 	fn assert_root(data: Vec<(&[u8], &[u8])>, hash: &str) {
 		let memdb = Rc::new(MemoryDB::new());

diff --git a/core/merkle-patricia-trie/src/trie.rs b/core/merkle-patricia-trie/src/trie.rs
@@ -765,17 +765,16 @@ impl<'a> Iterator for TrieIterator<'a> {
 
 #[cfg(test)]
 mod tests {
-	use rand::distributions::Alphanumeric;
-	use rand::seq::SliceRandom;
-	use rand::{thread_rng, Rng};
 	use std::collections::{HashMap, HashSet};
 	use std::rc::Rc;
 
 	use ethereum_types;
+	use rand::distributions::Alphanumeric;
+	use rand::seq::SliceRandom;
+	use rand::{thread_rng, Rng};
 
 	use super::*;
 	use crate::db::MemoryDB;
-	use core::borrow::Borrow;
 
 	#[test]
 	fn test_trie_insert() {
@@ -996,7 +995,7 @@ mod tests {
 	#[test]
 	fn iterator_trie() {
 		let memdb = Rc::new(MemoryDB::new());
-		let mut root1;
+		let root1;
 		let mut kv = HashMap::new();
 		kv.insert(b"test".to_vec(), b"test".to_vec());
 		kv.insert(b"test1".to_vec(), b"test1".to_vec());

diff --git a/core/sr-eth-primitives/src/header.rs b/core/sr-eth-primitives/src/header.rs
@@ -484,7 +484,7 @@ mod tests {
 	fn can_calculate_difficulty_ropsten() {
 		let (header1, header2) = ropsten_sequential_header();
 		let expected = U256::from_str("f3c49f25").unwrap();
-		let mut ethash_params = EthashPartial::ropsten_testnet();
+		let ethash_params = EthashPartial::ropsten_testnet();
 		//		ethash_params.set_difficulty_bomb_delays(0xc3500, 5000000);
 		assert_eq!(ethash_params.calculate_difficulty(&header2, &header1), expected);
 	}
@@ -493,7 +493,7 @@ mod tests {
 	fn can_calculate_difficulty_production() {
 		let (header1, header2) = sequential_header();
 		let expected = U256::from_str("92c07e50de0b9").unwrap();
-		let mut ethash_params = EthashPartial::production();
+		let ethash_params = EthashPartial::production();
 		assert_eq!(ethash_params.calculate_difficulty(&header2, &header1), expected);
 	}
 

diff --git a/core/sr-eth-primitives/src/receipt.rs b/core/sr-eth-primitives/src/receipt.rs
@@ -1,14 +1,12 @@
-use super::*;
+use codec::{Decode, Encode};
 use ethbloom::{Bloom, Input as BloomInput};
+use primitive_types::{H256, U256};
 use rlp::*;
 use rstd::prelude::*;
-//use substrate_primitives::RuntimeDebug;
-
-use codec::{Decode, Encode};
-use primitive_types::{H256, U256};
-
 use sr_primitives::RuntimeDebug;
 
+use super::*;
+
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
 pub enum TransactionOutcome {
 	/// Status and state root are unknown under EIP-98 rules.
@@ -118,14 +116,13 @@ impl Decodable for Receipt {
 
 #[cfg(test)]
 mod tests {
-	use super::{Address, LogEntry, Receipt, TransactionOutcome, H256, U128, U256};
-	use ethbloom::Bloom;
-	use hex_literal::*;
-	use rustc_hex::FromHex;
 	use std::str::FromStr;
 
+	use hex_literal::*;
 	use keccak_hasher::KeccakHasher;
-	use triehash::ordered_trie_root;
+	use rustc_hex::FromHex;
+
+	use super::*;
 
 	#[inline]
 	fn construct_receipts(
@@ -159,7 +156,7 @@ mod tests {
 			data: vec![],
 		}];
 
-		let r = construct_receipts(None, U256::from(U128::from(21000)), Some(1), log_entries);
+		let _r = construct_receipts(None, U256::from(U128::from(21000)), Some(1), log_entries);
 		//		let rs = &rlp::encode(&r)[..];
 		// TODO: fix logbloom not match here!
 		//		assert_eq!(r.log_bloom, Bloom::from_str(

diff --git a/node/runtime/Cargo.toml b/node/runtime/Cargo.toml
@@ -51,7 +51,6 @@ version = { package = "sr-version", git = "https://github.com/darwinia-network/s
 
 # darwinia
 balances = { package = "darwinia-balances", path = '../../srml/balances', default-features = false }
-darwinia-support = { path = "../../srml/support", default-features = false }
 eth-relay = { package = "darwinia-eth-relay", path = "../../srml/eth-relay", default-features = false }
 kton = { package = "darwinia-kton", path = '../../srml/kton', default-features = false }
 node-primitives = { path = "../primitives", default-features = false }
@@ -108,7 +107,6 @@ std = [
 
 	# darwinia
 	"balances/std",
-	"darwinia-support/std",
 	"eth-relay/std",
 	"kton/std",
 	"node-primitives/std",

diff --git a/node/runtime/src/constants.rs b/node/runtime/src/constants.rs
@@ -61,10 +61,10 @@ pub mod time {
 
 	pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES;
 	pub const EPOCH_DURATION_IN_SLOTS: u64 = {
-		//		const SLOT_FILL_RATE: f64 = MILLISECS_PER_BLOCK as f64 / SLOT_DURATION as f64;
+		const SLOT_FILL_RATE: f64 = MILLISECS_PER_BLOCK as f64 / SLOT_DURATION as f64;
 
 		// Develop
-		5
+		60
 		// Production
 		//		(EPOCH_DURATION_IN_BLOCKS as f64 * SLOT_FILL_RATE) as u64
 	};

diff --git a/node/runtime/src/lib.rs b/node/runtime/src/lib.rs
@@ -58,7 +58,6 @@ use version::NativeVersion;
 use version::RuntimeVersion;
 
 use constants::{currency::*, time::*};
-use darwinia_support::TimeStamp;
 use impls::{Author, CurrencyToVoteHandler, LinearWeightToFee, TargetedFeeAdjustment};
 
 // Make the WASM binary available.
@@ -350,9 +349,12 @@ impl kton::Trait for Runtime {
 }
 
 parameter_types! {
-	pub const SessionsPerEra: sr_staking_primitives::SessionIndex = 6;
-	// about 14 days = 14 * 24 * 60 * 60
-	pub const BondingDuration: TimeStamp = 1_209_600;
+	// Develop
+	pub const SessionsPerEra: sr_staking_primitives::SessionIndex = 1;
+	// Production
+	//	pub const SessionsPerEra: sr_staking_primitives::SessionIndex = 6;
+	// about 14 days = 14 * 24 * 60 * 60 * 1000
+	pub const BondingDuration: Moment = 1_209_600_000;
 	// decimal 9
 	pub const HardCap: Balance = 10_000_000_000 * COIN;
 	// date in Los Angeles*: 11/19/2019, 2:33:20 AM