From 8fa62130e3548614452d22f22f6fb45409ab1815 Mon Sep 17 00:00:00 2001 From: arkpar Date: Fri, 19 Feb 2016 00:23:05 +0100 Subject: [PATCH] Added TODOs --- ethcore/src/block.rs | 2 +- ethcore/src/evm/interpreter.rs | 4 ++-- ethcore/src/receipt.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs index b646c4cde..d72fbd1ae 100644 --- a/ethcore/src/block.rs +++ b/ethcore/src/block.rs @@ -267,7 +267,7 @@ impl<'x, 'y> OpenBlock<'x, 'y> { s.block.base.header.uncles_hash = uncle_bytes.sha3(); s.block.base.header.state_root = s.block.state.root().clone(); s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|ref r| r.rlp_bytes().to_vec()).collect()); - s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b}); + s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b}); //TODO: use |= operator s.block.base.header.gas_used = s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used); s.block.base.header.note_dirty(); diff --git a/ethcore/src/evm/interpreter.rs b/ethcore/src/evm/interpreter.rs index c04b7e1a9..7efd79d00 100644 --- a/ethcore/src/evm/interpreter.rs +++ b/ethcore/src/evm/interpreter.rs @@ -299,7 +299,7 @@ impl evm::Evm for Interpreter { let (gas_cost, mem_size) = try!(self.get_gas_cost_mem(ext, instruction, &mut mem, &stack)); try!(self.verify_gas(¤t_gas, &gas_cost)); mem.expand(mem_size); - current_gas = current_gas - gas_cost; + current_gas = current_gas - gas_cost; //TODO: use operator -= evm_debug!({ println!("[0x{:x}][{}(0x{:x}) Gas: {:x}\n Gas Before: {:x}", @@ -320,7 +320,7 @@ impl evm::Evm for Interpreter { match result { InstructionResult::Ok => {}, InstructionResult::UnusedGas(gas) => { - current_gas = current_gas + gas; + current_gas = current_gas + gas; //TODO: use operator += }, InstructionResult::UseAllGas => { current_gas = U256::zero(); diff --git a/ethcore/src/receipt.rs b/ethcore/src/receipt.rs index cd1897535..59c842cd4 100644 --- a/ethcore/src/receipt.rs +++ b/ethcore/src/receipt.rs @@ -39,7 +39,7 @@ impl Receipt { Receipt { state_root: state_root, gas_used: gas_used, - log_bloom: logs.iter().fold(LogBloom::new(), |mut b, l| { b = b | l.bloom(); b }), + log_bloom: logs.iter().fold(LogBloom::new(), |mut b, l| { b = &b | &l.bloom(); b }), //TODO: use |= operator logs: logs, } }