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

rename DatabaseValueView::new to from_rlp (#8159)

Browse Source
This commit is contained in:
Andrew Jones 2018-03-20 02:02:07 +00:00 committed by Marek Kotewicz
parent 7f1ff152ca
commit d7f690c8ba
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/journaldb/src/earlymergedb.rs
View File

@ -266,13 +266,12 @@ impl EarlyMergeDB {
let mut era = decode::<u64>(&val); let mut era = decode::<u64>(&val);
latest_era = Some(era); latest_era = Some(era);
loop { loop {
//let mut index = 0usize;
let mut db_key = DatabaseKey { let mut db_key = DatabaseKey {
era, era,
index: 0usize, index: 0usize,
}; };
while let Some(rlp_data) = db.get(col, &encode(&db_key)).expect("Low-level database error.") { while let Some(rlp_data) = db.get(col, &encode(&db_key)).expect("Low-level database error.") {
let inserts = DatabaseValueView::new(&rlp_data).inserts().expect("rlp read from db; qed"); let inserts = DatabaseValueView::from_rlp(&rlp_data).inserts().expect("rlp read from db; qed");
Self::replay_keys(&inserts, db, col, &mut refs); Self::replay_keys(&inserts, db, col, &mut refs);
db_key.index += 1; db_key.index += 1;
}; };
@ -440,7 +439,7 @@ impl JournalDB for EarlyMergeDB {
last = encode(&db_key); last = encode(&db_key);
self.backing.get(self.column, &last) self.backing.get(self.column, &last)
}? { }? {
let view = DatabaseValueView::new(&rlp_data); let view = DatabaseValueView::from_rlp(&rlp_data);
let inserts = view.inserts().expect("rlp read from db; qed"); let inserts = view.inserts().expect("rlp read from db; qed");
if canon_id == &view.id().expect("rlp read from db; qed") { if canon_id == &view.id().expect("rlp read from db; qed") {

2
util/journaldb/src/refcounteddb.rs
View File

@ -169,7 +169,7 @@ impl JournalDB for RefCountedDB {
&last &last
})? })?
} { } {
let view = DatabaseValueView::new(&rlp_data); let view = DatabaseValueView::from_rlp(&rlp_data);
let our_id = view.id().expect("rlp read from db; qed"); let our_id = view.id().expect("rlp read from db; qed");
let to_remove = if canon_id == &our_id { let to_remove = if canon_id == &our_id {
view.deletes() view.deletes()

2
util/journaldb/src/util.rs
View File

@ -38,7 +38,7 @@ pub struct DatabaseValueView<'a> {
} }
impl<'a> DatabaseValueView<'a> { impl<'a> DatabaseValueView<'a> {
pub fn new(data: &'a [u8]) -> Self { pub fn from_rlp(data: &'a [u8]) -> Self {
DatabaseValueView { DatabaseValueView {
rlp: UntrustedRlp::new(data), rlp: UntrustedRlp::new(data),
} }