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

Merge branch 'master' into signer-rpc

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-05-28 19:09:45 +02:00
commit 30362bfebe
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/src/blooms/group_position.rs
View File

@ -17,7 +17,7 @@
use bloomchain::group as bc; use bloomchain::group as bc;
use util::HeapSizeOf; use util::HeapSizeOf;
/// Represents BloomGroup position in database. /// Represents `BloomGroup` position in database.
#[derive(PartialEq, Eq, Hash, Clone, Debug)] #[derive(PartialEq, Eq, Hash, Clone, Debug)]
pub struct GroupPosition { pub struct GroupPosition {
/// Bloom level. /// Bloom level.

2
ethcore/src/trace/db.rs
View File

@ -54,7 +54,7 @@ impl Key<BlockTraces> for H256 {
} }
} }
/// Wrapper around blooms::GroupPosition so it could be /// Wrapper around `blooms::GroupPosition` so it could be
/// uniquely identified in the database. /// uniquely identified in the database.
#[derive(Debug, PartialEq, Eq, Hash, Clone)] #[derive(Debug, PartialEq, Eq, Hash, Clone)]
struct TraceGroupPosition(blooms::GroupPosition); struct TraceGroupPosition(blooms::GroupPosition);

2
parity/migration.rs
View File

@ -73,7 +73,7 @@ fn version_file_path(path: &PathBuf) -> PathBuf {
} }
/// Reads current database version from the file at given path. /// Reads current database version from the file at given path.
/// If the file does not exist returns DEFAULT_VERSION. /// If the file does not exist returns `DEFAULT_VERSION`.
fn current_version(path: &PathBuf) -> Result<u32, Error> { fn current_version(path: &PathBuf) -> Result<u32, Error> {
match File::open(version_file_path(path)) { match File::open(version_file_path(path)) {
Err(ref err) if err.kind() == ErrorKind::NotFound => Ok(DEFAULT_VERSION), Err(ref err) if err.kind() == ErrorKind::NotFound => Ok(DEFAULT_VERSION),