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

executive create fixes

This commit is contained in:
debris 2016-01-09 02:12:17 +01:00
parent bcd026aaf1
commit 5ae0f71922
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/evm/executive.rs
View File

@ -107,18 +107,15 @@ impl<'a> Executive<'a> {
} }
fn create(&mut self) -> ExecutiveResult { fn create(&mut self) -> ExecutiveResult {
let address = self.params.address.clone(); self.state.inc_nonce(&self.params.sender);
let new_address = self.params.address.clone();
self.state.inc_nonce(&address);
{ {
let evm = VmFactory::create(); let evm = VmFactory::create();
// TODO: valdidate that exec returns proper code // TODO: valdidate that exec returns proper code
evm.exec(self); evm.exec(self);
} }
self.state.transfer_balance(&address, &new_address, &self.params.value); self.state.transfer_balance(&self.params.sender, &self.params.address, &self.params.value);
ExecutiveResult::Ok ExecutiveResult::Ok
} }
@ -226,6 +223,7 @@ mod tests {
use spec::*; use spec::*;
use engine::*; use engine::*;
use evm_schedule::*; use evm_schedule::*;
use super::contract_address;
struct TestEngine { struct TestEngine {
spec: Spec spec: Spec
@ -248,27 +246,32 @@ mod tests {
#[test] #[test]
fn test_contract_address() { fn test_contract_address() {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let contract_address = Address::from_str("3f09c73a5ed19289fb9bdc72f1742566df146f56").unwrap(); let expected_address = Address::from_str("3f09c73a5ed19289fb9bdc72f1742566df146f56").unwrap();
assert_eq!(contract_address, super::contract_address(&address, &U256::from(88))); assert_eq!(expected_address, contract_address(&address, &U256::from(88)));
} }
#[test] #[test]
fn test_executive() { fn test_executive() {
//let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let sender = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
//let new_address = super::contract_address(&address, &U256::zero()); let address = contract_address(&sender, &U256::zero());
//let mut state = State::new_temp(); let mut params = EvmParams::new_create();
//state.add_balance(&address, &U256::from(0x100_000_000u64)); params.address = address.clone();
//let info = EnvInfo::new(); params.sender = sender.clone();
//let engine = TestEngine::new(); params.gas = U256::from(0x174876e800u64);
//let mut transaction = Transaction::new(); params.code = "3331600055".from_hex().unwrap();
//transaction.data = "3331600055".from_hex().unwrap(); params.value = U256::from(0x7);
//transaction.gas = U256::from(0x174876e800u64); let mut state = State::new_temp();
state.add_balance(&sender, &U256::from(0x100u64));
let info = EnvInfo::new();
let engine = TestEngine::new();
//{ {
//let mut ex = Executive::new(&mut state, &info, &engine, &transaction); let mut ex = Executive::new_from_params(&mut state, &info, &engine, params);
//ex.exec(); ex.exec();
//} }
//assert_eq!(state.storage_at(&new_address, &H256::new()), H256::from(&U256::from(0x100_000_000u64))); assert_eq!(state.storage_at(&address, &H256::new()), H256::from(&U256::from(0x100u64)));
assert_eq!(state.balance(&sender), U256::from(0xf9));
assert_eq!(state.balance(&address), U256::from(0x7));
} }
} }