fix json tests
This commit is contained in:
parent
1fba73c15e
commit
636b2deb2e
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
use super::test_common::*;
|
use super::test_common::*;
|
||||||
use action_params::ActionParams;
|
use action_params::ActionParams;
|
||||||
use state::{State, Substate};
|
use state::{Backend as StateBackend, State, Substate};
|
||||||
use executive::*;
|
use executive::*;
|
||||||
use engines::Engine;
|
use engines::Engine;
|
||||||
use env_info::EnvInfo;
|
use env_info::EnvInfo;
|
||||||
@ -51,15 +51,19 @@ impl From<ethjson::vm::Call> for CallCreate {
|
|||||||
|
|
||||||
/// Tiny wrapper around executive externalities.
|
/// Tiny wrapper around executive externalities.
|
||||||
/// Stores callcreates.
|
/// Stores callcreates.
|
||||||
struct TestExt<'a, T, V> where T: 'a + Tracer, V: 'a + VMTracer {
|
struct TestExt<'a, T: 'a, V: 'a, B: 'a>
|
||||||
ext: Externalities<'a, T, V>,
|
where T: Tracer, V: VMTracer, B: StateBackend
|
||||||
|
{
|
||||||
|
ext: Externalities<'a, T, V, B>,
|
||||||
callcreates: Vec<CallCreate>,
|
callcreates: Vec<CallCreate>,
|
||||||
contract_address: Address
|
contract_address: Address
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, T, V> TestExt<'a, T, V> where T: 'a + Tracer, V: 'a + VMTracer {
|
impl<'a, T: 'a, V: 'a, B: 'a> TestExt<'a, T, V, B>
|
||||||
|
where T: Tracer, V: VMTracer, B: StateBackend
|
||||||
|
{
|
||||||
fn new(
|
fn new(
|
||||||
state: &'a mut State,
|
state: &'a mut State<B>,
|
||||||
info: &'a EnvInfo,
|
info: &'a EnvInfo,
|
||||||
engine: &'a Engine,
|
engine: &'a Engine,
|
||||||
vm_factory: &'a Factory,
|
vm_factory: &'a Factory,
|
||||||
@ -79,7 +83,9 @@ impl<'a, T, V> TestExt<'a, T, V> where T: 'a + Tracer, V: 'a + VMTracer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, T, V> Ext for TestExt<'a, T, V> where T: Tracer, V: VMTracer {
|
impl<'a, T: 'a, V: 'a, B: 'a> Ext for TestExt<'a, T, V, B>
|
||||||
|
where T: Tracer, V: VMTracer, B: StateBackend
|
||||||
|
{
|
||||||
fn storage_at(&self, key: &H256) -> H256 {
|
fn storage_at(&self, key: &H256) -> H256 {
|
||||||
self.ext.storage_at(key)
|
self.ext.storage_at(key)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user