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

Merge branch 'master' of github.com:gavofyork/ethcore into verification

Browse Source
This commit is contained in:
arkpar
2016-01-10 15:21:11 +01:00
parent af21038bb9 1bcb6f8ee3
commit daab45f599
13 changed files with 353 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ethereum/ethash.rs
View File

@@ -24,7 +24,7 @@ impl Engine for Ethash {
/// Apply the block reward on finalisation of the block.
fn on_close_block(&self, block: &mut Block) {
let a = block.header().author.clone();
block.state_mut().add_balance(&a, &decode(&self.spec().engine_params.get("block_reward").unwrap()));
block.state_mut().add_balance(&a, &decode(&self.spec().engine_params.get("blockReward").unwrap()));
}
fn verify_block(&self, mode: VerificationMode, header: &Header, parent: Option<&Header>, block: Option<&[u8]>) -> Result<(), VerificationError> {
@@ -113,11 +113,9 @@ impl Ethash {
}
}
// TODO: test for on_close_block.
#[test]
fn playpen() {
fn on_close_block() {
use super::*;
use state::*;
let engine = new_morden().to_engine().unwrap();
let genesis_header = engine.spec().genesis_header();
let mut db = OverlayDB::new_temp();

4
src/ethereum/mod.rs
View File

@@ -56,7 +56,7 @@ mod tests {
let genesis = morden.genesis_block();
assert_eq!(BlockView::new(&genesis).header_view().sha3(), H256::from_str("0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303").unwrap());
morden.to_engine();
let _ = morden.to_engine();
}
#[test]
@@ -67,6 +67,6 @@ mod tests {
let genesis = frontier.genesis_block();
assert_eq!(BlockView::new(&genesis).header_view().sha3(), H256::from_str("d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3").unwrap());
frontier.to_engine();
let _ = frontier.to_engine();
}
}