Move more code into state-account

ethcore/Cargo.toml

@@ -30,6 +30,7 @@ ethereum-types = "0.6.0"
 ethjson = { path = "../json" }
 ethkey = { path = "../accounts/ethkey" }
 evm = { path = "evm" }
+factories = { path = "factories" }
 futures = "0.1"
 hash-db = "0.12.4"
 parity-util-mem = "0.1"
@@ -46,12 +47,11 @@ log = "0.4"
 lru-cache = "0.1"
 macros = { path = "../util/macros" }
 memory-cache = { path = "../util/memory-cache" }
-memory-db = "0.12.4"
 num_cpus = "1.2"
 parity-bytes = "0.1"
 parity-snappy = "0.1"
 parking_lot = "0.8"
-pod-account = { path = "pod-account" }
+pod = { path = "pod" }
 trie-db = "0.12.4"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
 rand = "0.6"
@@ -61,16 +61,16 @@ rlp_derive = { path = "../util/rlp-derive" }
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-state-account = { path = "state-account" }
+account-state = { path = "account-state" }
 stats = { path = "../util/stats" }
 tempdir = { version = "0.3", optional = true }
 time-utils = { path = "../util/time-utils" }
+trace = { path = "trace" }
 trace-time = "0.1"
 triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
 unexpected = { path = "../util/unexpected" }
 using_queue = { path = "../miner/using-queue" }
 vm = { path = "vm" }
-wasm = { path = "wasm" }
 rand_xorshift = "0.1.1"
 
 [dev-dependencies]
@@ -108,15 +108,13 @@ evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 # EVM debug traces are printed.
 slow-blocks = []
 # Run JSON consensus tests.
-json-tests = ["env_logger", "test-helpers", "to-pod-full"]
+json-tests = ["env_logger", "test-helpers"]
 # Skip JSON consensus tests with pending issues.
 ci-skip-tests = []
 # Run memory/cpu heavy tests.
 test-heavy = []
 # Compile test helpers
 test-helpers = ["tempdir", "kvdb-rocksdb", "blooms-db"]
-# Enables slow 'to-pod-full' method for use in tests and evmbin.
-to-pod-full = []
 
 [[bench]]
 name = "builtin"

ethcore/state-account/Cargo.toml → ethcore/account-state/Cargo.toml

@@ -1,28 +1,37 @@
 [package]
-description = "Ethereum accounts, keeps track of changes to the code and storage."
-name = "state-account"
+description = "Ethereum accounts, keeps track of changes to the code and storage"
+name = "account-state"
 version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 
 [dependencies]
 common-types = { path = "../types"}
+derive_more = "0.15.0"
 ethereum-types = "0.6.0"
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
+evm = { path = "../evm" }
+factories = { path = "../factories" }
 hash-db = "0.12.4"
+journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.2.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 kvdb = "0.1.0"
 log = "0.4"
 lru-cache = "0.1.2"
+memory-db = "0.12.4"
 parity-bytes = "0.1.0"
-pod-account = { path = "../pod-account" }
+parity-util-mem = "0.1.0"
+parking_lot = "0.8.0"
+pod = { path = "../pod" }
 rlp = "0.4.0"
 serde = { version = "1.0", features = ["derive"] }
+trace = { path = "../trace" }
 trie-db = "0.12.4"
+vm = { path = "../vm" }
 
 [dev-dependencies]
 account-db = { path = "../account-db" }
-rlp_compress = { path = "../../util/rlp-compress" }
 journaldb = { path = "../../util/journaldb" }
 parity-bytes = "0.1.0"
+rlp_compress = { path = "../../util/rlp-compress" }