From 98ae8ce36aaf8d1335473d7420537eaf456f9d17 Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 14 Jan 2016 21:47:52 +0100 Subject: [PATCH] cleanup... --- src/executive.rs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/executive.rs b/src/executive.rs index c9a829f8a..a8dc1b968 100644 --- a/src/executive.rs +++ b/src/executive.rs @@ -398,7 +398,6 @@ impl<'a> Ext for Externalities<'a> { Ok(gas_left) => (gas_left, Some(address)), _ => (U256::zero(), None) } - //ex.create(¶ms, self.substate).map(|gas_left| (gas_left, Some(address))) } fn call(&mut self, @@ -426,15 +425,12 @@ impl<'a> Ext for Externalities<'a> { if gas_cost > *gas { self.substate.out_of_gas = true; return Err(evm::Error::OutOfGas); - //return (U256::from(-1i64 as u64), false); } let gas = *gas - gas_cost; // if balance is insufficient or we are to deep, return if self.state.balance(&self.params.address) < *value || self.depth >= self.schedule.max_depth { - //return Some(CallResult::new(gas + call_gas, true)); - //return (gas + call_gas, true); return Ok((gas + call_gas, true)); } @@ -452,13 +448,8 @@ impl<'a> Ext for Externalities<'a> { let mut ex = Executive::from_parent(self.state, self.info, self.engine, self.depth); match ex.call(¶ms, self.substate, BytesRef::Fixed(output)) { Ok(gas_left) => Ok((gas + gas_left, true)), //Some(CallResult::new(gas + gas_left, true)), - _ => { - self.substate.out_of_gas = true; - Ok((gas, false)) - //Some(CallResult::new(gas, false)) - } + _ => Ok((gas, false)) } - //ex.call(¶ms, self.substate, BytesRef::Fixed(output)).map(|gas_left| gas + gas_left) } fn extcode(&self, address: &Address) -> Vec {