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

Revert "[Trace] Distinguish between create and create2 (#11311)" (#11427)

Browse Source 
This reverts commit 87e1080581.
This commit is contained in:
David
2020-01-30 15:21:29 +01:00
committed by GitHub
parent bf44f024c6
commit 5d4993b0f8
23 changed files with 148 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ethcore/src/json_tests/executive.rs
View File

@@ -20,7 +20,7 @@ use super::test_common::*;
use account_state::{Backend as StateBackend, State};
use evm::Finalize;
use vm::{
self, ActionParams, ActionType, Schedule, Ext,
self, ActionParams, CallType, Schedule, Ext,
ContractCreateResult, EnvInfo, MessageCallResult,
CreateContractAddress, ReturnData,
};
@@ -172,7 +172,7 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for TestExt<'a, T, V, B>
value: Option<U256>,
data: &[u8],
_code_address: &Address,
_call_type: ActionType,
_call_type: CallType,
_trap: bool
) -> Result<MessageCallResult, vm::TrapKind> {
self.callcreates.push(CallCreate {

6
ethcore/src/tests/evm.rs
View File

@@ -18,7 +18,7 @@
use std::sync::Arc;
use hash::keccak;
use vm::{EnvInfo, ActionParams, ActionValue, ActionType, ParamsType};
use vm::{EnvInfo, ActionParams, ActionValue, CallType, ParamsType};
use evm::Factory;
use machine::{
executive::Executive,
@@ -62,7 +62,7 @@ fn test_blockhash_eip210(factory: Factory) {
code_hash: Some(blockhash_contract_code_hash),
code_version: 0.into(),
data: Some(H256::from_low_u64_be(i - 1).as_bytes().to_vec()),
action_type: ActionType::Call,
call_type: CallType::Call,
params_type: ParamsType::Separate,
};
let schedule = machine.schedule(env_info.number);
@@ -86,7 +86,7 @@ fn test_blockhash_eip210(factory: Factory) {
code_hash: Some(get_prev_hash_code_hash),
code_version: 0.into(),
data: None,
action_type: ActionType::Call,
call_type: CallType::Call,
params_type: ParamsType::Separate,
};
let schedule = machine.schedule(env_info.number);