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

fixed take_node lifetimes

Browse Source
This commit is contained in:
debris 2015-12-01 02:04:52 +01:00
parent cceae8ecc2
commit 24f9771716
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/trie.rs
View File

@ -137,13 +137,13 @@ impl TrieDB {
/// Return the bytes encoding the node represented by `rlp`. It will be unlinked from /// Return the bytes encoding the node represented by `rlp`. It will be unlinked from
/// the trie. /// the trie.
fn take_node(&self, rlp: &Rlp, diff: &mut Diff) -> Bytes { fn take_node<'a, 'rlp_view>(&'a self, rlp: &'rlp_view Rlp<'a>, diff: &mut Diff) -> &'a [u8] where 'a: 'rlp_view {
if (rlp.is_list()) { if (rlp.is_list()) {
rlp.raw().to_vec() rlp.raw()
} }
else if (rlp.is_data() && rlp.size() == 32) { else if (rlp.is_data() && rlp.size() == 32) {
let h = H256::decode(rlp); let h = H256::decode(rlp);
let r = self.db.lookup(&h).expect("Trie root not found!").to_vec(); let r = self.db.lookup(&h).expect("Trie root not found!");
diff.delete_node_sha3(h); diff.delete_node_sha3(h);
r r
} }