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

Removed unused return type

Browse Source
This commit is contained in:
arkpar 2016-03-10 21:15:43 +01:00
parent 8785bd37e8
commit 06a3abd01e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/src/journaldb.rs
View File

@ -153,7 +153,7 @@ impl JournalDB {
} }
/// Commit all recent insert operations. /// Commit all recent insert operations.
pub fn commit(&mut self, now: u64, id: &H256, end: Option<(u64, H256)>) -> Result<u32, UtilError> { pub fn commit(&mut self, now: u64, id: &H256, end: Option<(u64, H256)>) -> Result<(), UtilError> {
let have_journal_overlay = self.journal_overlay.is_some(); let have_journal_overlay = self.journal_overlay.is_some();
if have_journal_overlay { if have_journal_overlay {
self.commit_with_overlay(now, id, end) self.commit_with_overlay(now, id, end)
@ -183,16 +183,16 @@ impl JournalDB {
} }
/// Just commit the transaction overlay into the backing DB. /// Just commit the transaction overlay into the backing DB.
fn commit_without_overlay(&mut self) -> Result<u32, UtilError> { fn commit_without_overlay(&mut self) -> Result<(), UtilError> {
let batch = DBTransaction::new(); let batch = DBTransaction::new();
let ret = Self::batch_overlay_insertions(&mut self.transaction_overlay, &batch); Self::batch_overlay_insertions(&mut self.transaction_overlay, &batch);
try!(self.backing.write(batch)); try!(self.backing.write(batch));
Ok(ret as u32) Ok(())
} }
/// Commit all recent insert operations and historical removals from the old era /// Commit all recent insert operations and historical removals from the old era
/// to the backing database. /// to the backing database.
fn commit_with_overlay(&mut self, now: u64, id: &H256, end: Option<(u64, H256)>) -> Result<u32, UtilError> { fn commit_with_overlay(&mut self, now: u64, id: &H256, end: Option<(u64, H256)>) -> Result<(), UtilError> {
// record new commit's details. // record new commit's details.
trace!("commit: #{} ({}), end era: {:?}", now, id, end); trace!("commit: #{} ({}), end era: {:?}", now, id, end);
let mut journal_overlay = self.journal_overlay.as_mut().unwrap().write().unwrap(); let mut journal_overlay = self.journal_overlay.as_mut().unwrap().write().unwrap();
@ -274,7 +274,7 @@ impl JournalDB {
journal_overlay.journal.remove(&end_era); journal_overlay.journal.remove(&end_era);
} }
try!(self.backing.write(batch)); try!(self.backing.write(batch));
Ok(0 as u32) Ok(())
} }
fn payload(&self, key: &H256) -> Option<Bytes> { fn payload(&self, key: &H256) -> Option<Bytes> {