grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[beta] Simple score (#4852)

Browse Source 
* simple score

* ignore part of a test
This commit is contained in:
keorn 2017-03-10 13:38:16 +01:00 committed by Arkadiy Paronyan
parent 07d4b9bbc9
commit 34e81101d7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethcore/src/engines/authority_round.rs
View File

@ -235,9 +235,8 @@ impl Engine for AuthorityRound {
} }
fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) { fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
// Chain scoring: total weight is sqrt(U256::max_value())*height - step // Chain scoring: weak height scoring, backported for compatibility.
let new_difficulty = U256::from(U128::max_value()) + header_step(parent).expect("Header has been verified; qed").into() - self.step.load(AtomicOrdering::SeqCst).into(); header.set_difficulty(parent.difficulty().clone());
header.set_difficulty(new_difficulty);
header.set_gas_limit({ header.set_gas_limit({
let gas_limit = parent.gas_limit().clone(); let gas_limit = parent.gas_limit().clone();
let bound_divisor = self.gas_limit_bound_divisor; let bound_divisor = self.gas_limit_bound_divisor;

2
sync/src/tests/consensus.rs
View File

@ -91,6 +91,7 @@ fn authority_round() {
assert_eq!(net.peer(1).chain.chain_info().best_block_number, 2); assert_eq!(net.peer(1).chain.chain_info().best_block_number, 2);
// Fork the network with equal height. // Fork the network with equal height.
/* Relies on view scoring, removed for now so that Kovan can be upgraded.
net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 2.into())).unwrap(); net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 2.into())).unwrap();
net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 2.into())).unwrap(); net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 2.into())).unwrap();
// Let both nodes build one block. // Let both nodes build one block.
@ -137,6 +138,7 @@ fn authority_round() {
assert_eq!(ci0.best_block_number, 5); assert_eq!(ci0.best_block_number, 5);
assert_eq!(ci1.best_block_number, 5); assert_eq!(ci1.best_block_number, 5);
assert_eq!(ci0.best_block_hash, ci1.best_block_hash); assert_eq!(ci0.best_block_hash, ci1.best_block_hash);
*/
} }
#[test] #[test]