Review fixes

Author: arkpar

ethcore/evm/src/interpreter/mod.rs

@@ -328,7 +328,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let contract_code = self.mem.read_slice(init_off, init_size);
 				let can_create = ext.balance(&params.address)? >= endowment && ext.depth() < ext.schedule().max_depth;
 
-				// clear return data buffer before crearing new call frame.
+				// clear return data buffer before creating new call frame.
 				self.return_data = ReturnData::empty();
 
 				if !can_create {
@@ -368,8 +368,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 					None
 				} else if instruction == instructions::STATICCALL {
 					Some(U256::zero())
-				}
-				else {
+				} else {
 					Some(stack.pop_back())
 				};
 
@@ -390,11 +389,11 @@ impl<Cost: CostType> Interpreter<Cost> {
 						if ext.is_static() && value.map_or(false, |v| !v.is_zero()) {
 							return Err(vm::Error::MutableCallInStaticContext);
 						}
-						let has_balance = ext.balance(&params.address)? >= value.expect("value set for all but delegate call and staticcall; qed");
+						let has_balance = ext.balance(&params.address)? >= value.expect("value set for all but delegate call; qed");
 						(&params.address, &code_address, has_balance, CallType::Call)
 					},
 					instructions::CALLCODE => {
-						let has_balance = ext.balance(&params.address)? >= value.expect("value set for all but delegate call and staticcall; qed");
+						let has_balance = ext.balance(&params.address)? >= value.expect("value set for all but delegate call; qed");
 						(&params.address, &params.address, has_balance, CallType::CallCode)
 					},
 					instructions::DELEGATECALL => (&params.sender, &params.address, true, CallType::DelegateCall),
@@ -423,12 +422,12 @@ impl<Cost: CostType> Interpreter<Cost> {
 					MessageCallResult::Success(gas_left, data) => {
 						stack.push(U256::one());
 						self.return_data = data;
-						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater then current one")))
+						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater than current one")))
 					},
 					MessageCallResult::Reverted(gas_left, data) => {
 						stack.push(U256::zero());
 						self.return_data = data;
-						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater then current one")))
+						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater than current one")))
 					},
 					MessageCallResult::Failed  => {
 						stack.push(U256::zero());

ethcore/res/ethereum/tests

@@ -211,7 +211,7 @@ impl Client {
 		trace!("Cleanup journal: DB Earliest = {:?}, Latest = {:?}", state_db.journal_db().earliest_era(), state_db.journal_db().latest_era());
 
 		let history = if config.history < MIN_HISTORY_SIZE {
-			debug!(target: "client", "Ignoring pruning history parameter of {}\
+			info!(target: "client", "Ignoring pruning history parameter of {}\
 				, falling back to minimum of {}",
 				config.history, MIN_HISTORY_SIZE);
 			MIN_HISTORY_SIZE

ethcore/src/client/client.rs

@@ -92,6 +92,7 @@ impl<'a> EvmTestClient<'a> {
 			ForkSpec::EIP158 => Some(&*EIP161),
 			ForkSpec::Byzantium => Some(&*BYZANTIUM),
 			ForkSpec::EIP158ToByzantiumAt5 => Some(&BYZANTIUM_TRANSITION),
+			ForkSpec::FrontierToHomesteadAt5 | ForkSpec::HomesteadToDaoAt5 | ForkSpec::HomesteadToEIP150At5 => None,
 			_ => None,
 		}
 	}

ethcore/src/client/evm_test_client.rs

@@ -32,6 +32,8 @@ use trace::{Tracer, NoopTracer};
 use trace::{VMTracer, NoopVMTracer};
 use bytes::{Bytes, BytesRef};
 use trie;
+use rlp::RlpStream;
+use hash::keccak;
 
 #[derive(Debug, PartialEq, Clone)]
 struct CallCreate {
@@ -259,15 +261,22 @@ fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec<String> {
 			(res.finalize(ex), callcreates)
 		};
 
+		let log_hash = {
+			let mut rlp = RlpStream::new_list(substate.logs.len());
+			for l in &substate.logs {
+				rlp.append(l);
+			}
+			keccak(&rlp.drain())
+		};
+
 		match res {
 			Err(_) => fail_unless(out_of_gas, "didn't expect to run out of gas."),
 			Ok(res) => {
 				fail_unless(!out_of_gas, "expected to run out of gas.");
 				fail_unless(Some(res.gas_left) == vm.gas_left.map(Into::into), "gas_left is incorrect");
 				let vm_output: Option<Vec<u8>> = vm.output.map(Into::into);
 				fail_unless(Some(output) == vm_output, "output is incorrect");
-				// TODO: verify logs
-				//fail_unless(Some(res.logs) == vm.logs, "logs are incorrect");
+				fail_unless(Some(log_hash) == vm.logs.map(|h| h.0), "logs are incorrect");
 
 				for (address, account) in vm.post_state.unwrap().into_iter() {
 					let address = address.into();

ethcore/src/json_tests/executive.rs

@@ -505,7 +505,9 @@ impl<B: Backend> State<B> {
 
 	/// Determine whether an account exists and has code or non-zero nonce.
 	pub fn exists_and_has_code_or_nonce(&self, a: &Address) -> trie::Result<bool> {
-		self.ensure_cached(a, RequireCache::CodeSize, false, |a| a.map_or(false, |a| a.code_size().map_or(false, |size| size != 0 || !a.nonce().is_zero())))
+		self.ensure_cached(a, RequireCache::CodeSize, false,
+			|a| a.map_or(false, |a| a.code_size().map_or(false,
+				|size| size != 0 || *a.nonce() != self.account_start_nonce)))
 	}
 
 	/// Get the balance of account `a`.
@@ -698,9 +700,9 @@ impl<B: Backend> State<B> {
 		let e = self.execute(env_info, engine, t, options, false)?;
 
 		let eip658 = env_info.number >= engine.params().eip658_transition;
-		let no_intermediate_commits = (env_info.number >= engine.params().eip98_transition
-			&& env_info.number >= engine.params().validate_receipts_transition)
-			|| eip658;
+		let no_intermediate_commits =
+			eip658 ||
+			(env_info.number >= engine.params().eip98_transition && env_info.number >= engine.params().validate_receipts_transition);
 
 		let state_root = if no_intermediate_commits {
 			None

ethcore/src/state/mod.rs

@@ -197,7 +197,6 @@ impl Schedule {
 		schedule.have_revert = true;
 		schedule.have_static_call = true;
 		schedule.have_return_data = true;
-		schedule.blockhash_gas = 800;
 		schedule
 	}
 

ethcore/vm/src/schedule.rs

@@ -86,7 +86,7 @@ mod tests {
 			"gas" : "0x013874",
 			"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
 			"out" : "0x",
-			"network" : "Fronier",
+			"network" : "Frontier",
 			"post" : {
 				"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
 					"balance" : "0x0de0b6b3a7640000",