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

Enable PoD sutff.

Browse Source
This commit is contained in:
Gav Wood 2016-05-31 12:59:00 +02:00
parent 649767b911
commit f9a0cc47a0
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/src/account.rs
View File

@ -51,8 +51,6 @@ impl Account {
} }
} }
#[cfg(test)]
#[cfg(feature = "json-tests")]
/// General constructor. /// General constructor.
pub fn from_pod(pod: PodAccount) -> Account { pub fn from_pod(pod: PodAccount) -> Account {
Account { Account {

3
ethcore/src/pod_state.rs
View File

@ -29,7 +29,6 @@ impl PodState {
pub fn new() -> PodState { Default::default() } pub fn new() -> PodState { Default::default() }
/// Contruct a new object from the `m`. /// Contruct a new object from the `m`.
#[cfg(test)]
pub fn from(m: BTreeMap<Address, PodAccount>) -> PodState { PodState(m) } pub fn from(m: BTreeMap<Address, PodAccount>) -> PodState { PodState(m) }
/// Get the underlying map. /// Get the underlying map.
@ -41,8 +40,6 @@ impl PodState {
} }
/// Drain object to get the underlying map. /// Drain object to get the underlying map.
#[cfg(test)]
#[cfg(feature = "json-tests")]
pub fn drain(self) -> BTreeMap<Address, PodAccount> { self.0 } pub fn drain(self) -> BTreeMap<Address, PodAccount> { self.0 }
} }

6
ethcore/src/state.rs
View File

@ -20,11 +20,7 @@ use executive::{Executive, TransactOptions};
use evm::Factory as EvmFactory; use evm::Factory as EvmFactory;
use account_db::*; use account_db::*;
use trace::Trace; use trace::Trace;
#[cfg(test)]
#[cfg(feature = "json-tests")]
use pod_account::*; use pod_account::*;
#[cfg(test)]
#[cfg(feature = "json-tests")]
use pod_state::PodState; use pod_state::PodState;
//use state_diff::*; // TODO: uncomment once to_pod() works correctly. //use state_diff::*; // TODO: uncomment once to_pod() works correctly.
@ -275,8 +271,6 @@ impl State {
} }
} }
#[cfg(test)]
#[cfg(feature = "json-tests")]
/// Populate a PodAccount map from this state. /// Populate a PodAccount map from this state.
pub fn to_pod(&self) -> PodState { pub fn to_pod(&self) -> PodState {
assert!(self.snapshots.borrow().is_empty()); assert!(self.snapshots.borrow().is_empty());