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

Refactor and cleanup.

Browse Source
This commit is contained in:
Gav Wood 2016-03-02 00:52:18 +01:00
parent 929f44fe4f
commit 30c6820437
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ethcore/src/block.rs
View File

@ -178,11 +178,12 @@ impl<'x> OpenBlock<'x> {
last_hashes: last_hashes, last_hashes: last_hashes,
}; };
r.block.base.header.set_number(parent.number() + 1); r.block.base.header.parent_hash = parent.hash();
r.block.base.header.set_author(author); r.block.base.header.number = parent.number + 1;
r.block.base.header.set_extra_data(extra_data); r.block.base.header.author = author;
r.block.base.header.set_timestamp_now(parent.timestamp()); r.block.base.header.set_timestamp_now(parent.timestamp());
r.block.base.header.set_parent_hash(parent.hash()); r.block.base.header.extra_data = extra_data;
r.block.base.header.note_dirty();
engine.populate_from_parent(&mut r.block.base.header, parent); engine.populate_from_parent(&mut r.block.base.header, parent);
engine.on_new_block(&mut r.block); engine.on_new_block(&mut r.block);

3
ethcore/src/engine.rs
View File

@ -84,10 +84,9 @@ pub trait Engine : Sync + Send {
/// Don't forget to call Super::populate_from_parent when subclassing & overriding. /// Don't forget to call Super::populate_from_parent when subclassing & overriding.
// TODO: consider including State in the params. // TODO: consider including State in the params.
fn populate_from_parent(&self, header: &mut Header, parent: &Header) { fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
header.parent_hash = parent.hash;
header.difficulty = parent.difficulty; header.difficulty = parent.difficulty;
header.gas_limit = parent.gas_limit; header.gas_limit = parent.gas_limit;
header.number = parent.number + 1; header.note_dirty();
} }
// TODO: builtin contract routing - to do this properly, it will require removing the built-in configuration-reading logic // TODO: builtin contract routing - to do this properly, it will require removing the built-in configuration-reading logic

2
ethcore/src/ethereum/ethash.rs
View File

@ -104,7 +104,7 @@ impl Engine for Ethash {
max(gas_floor_target, gas_limit - gas_limit / bound_divisor + x!(1) + (header.gas_used * x!(6) / x!(5)) / bound_divisor) max(gas_floor_target, gas_limit - gas_limit / bound_divisor + x!(1) + (header.gas_used * x!(6) / x!(5)) / bound_divisor)
} }
}; };
header.note_dirty();
// info!("ethash: populate_from_parent #{}: difficulty={} and gas_limit={}", header.number, header.difficulty, header.gas_limit); // info!("ethash: populate_from_parent #{}: difficulty={} and gas_limit={}", header.number, header.difficulty, header.gas_limit);
} }

2
rpc/src/v1/impls/web3.rs
View File

@ -31,7 +31,7 @@ impl Web3 for Web3Client {
fn client_version(&self, params: Params) -> Result<Value, Error> { fn client_version(&self, params: Params) -> Result<Value, Error> {
match params { match params {
Params::None => { Params::None => {
Ok(Value::String(version())), Ok(Value::String(version().to_owned().replace("Parity/", "Parity//"))),
} }
_ => Err(Error::invalid_params()) _ => Err(Error::invalid_params())
} }

2
util/src/misc.rs
View File

@ -70,7 +70,7 @@ pub fn contents(name: &str) -> Result<Bytes, UtilError> {
/// Get the standard version string for this software. /// Get the standard version string for this software.
pub fn version() -> String { pub fn version() -> String {
format!("Parity//v{}-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version()) format!("Parity/v{}-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version())
} }
/// Get the standard version data for this software. /// Get the standard version data for this software.