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

fixed conflicting namespaces

Browse Source
This commit is contained in:
Nikolay Volf 2016-02-10 02:20:36 +03:00
parent dabce9ab45
commit 4ab99a6bb3
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,15 +26,15 @@ use externalities::*;
use substate::*; use substate::*;
use tests::helpers::*; use tests::helpers::*;
struct TestEngine { struct TestEngineFrontier {
vm_factory: Factory, vm_factory: Factory,
spec: Spec, spec: Spec,
max_depth: usize max_depth: usize
} }
impl TestEngine { impl TestEngineFrontier {
fn new(max_depth: usize, vm_type: VMType) -> TestEngine { fn new(max_depth: usize, vm_type: VMType) -> TestEngineFrontier {
TestEngine { TestEngineFrontier {
vm_factory: Factory::new(vm_type), vm_factory: Factory::new(vm_type),
spec: ethereum::new_frontier_test(), spec: ethereum::new_frontier_test(),
max_depth: max_depth max_depth: max_depth
@ -42,7 +42,7 @@ impl TestEngine {
} }
} }
impl Engine for TestEngine { impl Engine for TestEngineFrontier {
fn name(&self) -> &str { "TestEngine" } fn name(&self) -> &str { "TestEngine" }
fn spec(&self) -> &Spec { &self.spec } fn spec(&self) -> &Spec { &self.spec }
fn vm_factory(&self) -> &Factory { &self.vm_factory } fn vm_factory(&self) -> &Factory { &self.vm_factory }
@ -209,7 +209,7 @@ fn do_json_test_for(vm: &VMType, json_data: &[u8]) -> Vec<String> {
EnvInfo::from_json(env) EnvInfo::from_json(env)
}).unwrap_or_default(); }).unwrap_or_default();
let engine = TestEngine::new(1, vm.clone()); let engine = TestEngineFrontier::new(1, vm.clone());
// params // params
let mut params = ActionParams::default(); let mut params = ActionParams::default();