Remove to-pod-full feature

openethereum · Jul 7, 2019 · a57517c · a57517c
1 parent 1cf8254
commit a57517c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -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"

diff --git a/ethcore/account-state/Cargo.toml b/ethcore/account-state/Cargo.toml
@@ -35,7 +35,3 @@ account-db = { path = "../account-db" }
 journaldb = { path = "../../util/journaldb" }
 parity-bytes = "0.1.0"
 rlp_compress = { path = "../../util/rlp-compress" }
-
-[features]
-# Enables slow 'to-pod-full' method for use in tests and evmbin.
-to-pod-full = []
diff --git a/ethcore/account-state/src/state.rs b/ethcore/account-state/src/state.rs
@@ -791,7 +791,6 @@ impl<B: Backend> State<B> {
 		}))
 	}
 
-	#[cfg(feature="to-pod-full")]
 	/// Populate a PodAccount map from this state.
 	/// Warning this is not for real time use.
 	/// Use of this method requires FatDB mode to be able
@@ -830,9 +829,9 @@ impl<B: Backend> State<B> {
 	/// values of the account to the PodAccount.
 	/// This function is only intended for use in small tests or with fresh accounts.
 	/// It requires FatDB.
-	#[cfg(feature="to-pod-full")]
 	fn account_to_pod_account(&self, account: &Account, address: &Address) -> Result<PodAccount, Error> {
 		use ethereum_types::BigEndianHash;
+		assert!(self.factories.trie.is_fat());
 
 		let mut pod_storage = BTreeMap::new();
 		let addr_hash = account.address_hash(address);

diff --git a/ethcore/src/client/evm_test_client.rs b/ethcore/src/client/evm_test_client.rs
@@ -78,14 +78,9 @@ fn no_dump_state(_: &State<state_db::StateDB>) -> Option<PodState> {
 	None
 }
 
-#[cfg(feature = "to-pod-full")]
 fn dump_state(state: &State<state_db::StateDB>) -> Option<PodState> {
 	state.to_pod_full().ok()
 }
-#[cfg(not(feature = "to-pod-full"))]
-fn dump_state(_: &State<state_db::StateDB>) -> Option<PodState> {
-	None
-}
 
 impl<'a> fmt::Debug for EvmTestClient<'a> {
 	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {

diff --git a/ethcore/src/executive_state.rs b/ethcore/src/executive_state.rs
@@ -274,7 +274,6 @@ mod tests {
 	use trace::{FlatTrace, TraceError, trace};
 	use evm::CallType;
 	use pod::{self, PodAccount};
-	#[cfg(feature="to-pod-full")]
 	use pod::PodState;
 	use executive_state::ExecutiveState;
 	use account_state::{Account, CleanupMode};
@@ -1653,7 +1652,6 @@ mod tests {
 					})).as_ref());
 	}
 
-	#[cfg(feature="to-pod-full")]
 	#[test]
 	fn should_get_full_pod_storage_values() {
 		use trie::{TrieFactory, TrieSpec};

diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml
@@ -12,7 +12,7 @@ path = "./src/main.rs"
 common-types = { path = "../ethcore/types" }
 docopt = "1.0"
 env_logger = "0.5"
-ethcore = { path = "../ethcore", features = ["test-helpers", "json-tests", "to-pod-full"] }
+ethcore = { path = "../ethcore", features = ["test-helpers", "json-tests"] }
 ethereum-types = "0.6.0"
 ethjson = { path = "../json" }
 evm = { path = "../ethcore/evm" }
@@ -23,7 +23,7 @@ rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-account-state = { path = "../ethcore/account-state", features = ["to-pod-full"] }
+account-state = { path = "../ethcore/account-state" }
 trace = { path = "../ethcore/trace" }
 vm = { path = "../ethcore/vm" }