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

Merge branch 'master' into sfedgecase

Browse Source
This commit is contained in:
Gav Wood
2016-06-23 14:43:42 +02:00
parent 41e0769e63 082294fe81
commit bca9e1f31a
17 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ethcore/src/block.rs
View File

@@ -490,6 +490,7 @@ pub fn enact(
}
/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
#[cfg_attr(feature="dev", allow(too_many_arguments))]
pub fn enact_bytes(
block_bytes: &[u8],
engine: &Engine,
@@ -506,6 +507,7 @@ pub fn enact_bytes(
}
/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
#[cfg_attr(feature="dev", allow(too_many_arguments))]
pub fn enact_verified(
block: &PreverifiedBlock,
engine: &Engine,
@@ -521,6 +523,7 @@ pub fn enact_verified(
}
/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
#[cfg_attr(feature="dev", allow(too_many_arguments))]
pub fn enact_and_seal(
block_bytes: &[u8],
engine: &Engine,