Update JSON tests to d4f86ecf4aa7c

Cargo.toml

@@ -93,7 +93,6 @@ default = ["accounts"]
 accounts = ["ethcore-accounts", "parity-rpc/accounts"]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
-ci-skip-tests = ["ethcore/ci-skip-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]

ethcore/Cargo.toml

@@ -118,15 +118,13 @@ evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 slow-blocks = []
 # Run JSON consensus tests.
 json-tests = ["env_logger", "test-helpers", "lazy_static", "machine/test-helpers"]
-# Skip JSON consensus tests with pending issues.
-ci-skip-tests = []
 # Run memory/cpu heavy tests.
 test-heavy = []
 # Compile test helpers
 # note[dvdplm]: "basic-authority/test-helpers" is needed so that `generate_dummy_client_with_spec` works
 test-helpers = [
     "blooms-db",
-    "ethjson",
+    "ethjson/test-helpers",
     "ethkey",
     "kvdb-memorydb",
     "kvdb-rocksdb",

ethcore/account-state/src/state.rs

@@ -746,7 +746,7 @@ impl<B: Backend> State<B> {
 	/// Propagate local cache into shared canonical state cache.
 	fn propagate_to_global_cache(&mut self) {
 		let mut addresses = self.cache.borrow_mut();
-		trace!("Committing cache {:?} entries", addresses.len());
+		trace!(target: "state", "Committing cache {:?} entries", addresses.len());
 		for (address, a) in addresses.drain().filter(|&(_, ref a)| a.state == AccountState::Committed || a.state == AccountState::CleanFresh) {
 			self.db.add_to_account_cache(address, a.account, a.state == AccountState::Committed);
 		}

ethcore/res/ethereum/tests-issues/currents.json

@@ -1,4 +1,57 @@
 {
-	"block": [],
-	"state": []
+	"block": [
+		{
+			"reference": "Issue https://github.com/paritytech/parity-ethereum/issues/11073 (also see https://github.com/paritytech/parity-ethereum/pull/10923)",
+			"failing": "stRevertTest",
+			"subtests": [
+				"RevertPrecompiledTouch_d0g0v0_Byzantium",
+				"RevertPrecompiledTouch_d0g0v0_Constantinople",
+				"RevertPrecompiledTouch_d0g0v0_ConstantinopleFix",
+				"RevertPrecompiledTouch_d0g0v0_EIP158",
+				"RevertPrecompiledTouch_d3g0v0_ConstantinopleFix",
+				"RevertPrecompiledTouchCC_d0g0v0_Byzantium",
+				"RevertPrecompiledTouchCC_d0g0v0_Constantinople",
+				"RevertPrecompiledTouchCC_d0g0v0_EIP158",
+				"RevertPrecompiledTouchDC_d0g0v0_Byzantium",
+				"RevertPrecompiledTouchDC_d0g0v0_Constantinople",
+				"RevertPrecompiledTouchDC_d0g0v0_EIP158",
+				"RevertPrecompiledTouchExactOOG_d7g1v0_ConstantinopleFix",
+				"RevertPrecompiledTouchExactOOG_d31g1v0_ConstantinopleFix",
+				"RevertPrecompiledTouch_storage_d3g0v0_ConstantinopleFix",
+				"RevertPrecompiledTouch_storage_d0g0v0_ConstantinopleFix"
+			]
+		}
+	],
+	"state": [
+		{
+			"reference": "Issue https://github.com/paritytech/parity-ethereum/issues/11078 (also see https://github.com/paritytech/parity-ethereum/pull/10923)",
+			"failing": "stRevertTest",
+			"subtests": {
+				"RevertPrecompiledTouch_storage": {
+					"subnumbers": ["1", "2"],
+					"chain": "St. Peter's (test)"
+				}
+			}
+		},
+		{
+			"reference": "Issue https://github.com/paritytech/parity-ethereum/issues/11079 (also see https://github.com/paritytech/parity-ethereum/pull/10923)",
+			"failing": "stRevertTest",
+			"subtests": {
+				"RevertPrecompiledTouchExactOOG": {
+					"subnumbers": ["61", "64"],
+					"chain": "St. Peter's (test)"
+				}
+			}
+		},
+		{
+			"reference": "Issue https://github.com/paritytech/parity-ethereum/issues/11080 (also see https://github.com/paritytech/parity-ethereum/pull/10923)",
+			"failing": "stRevertTest",
+			"subtests": {
+				"RevertPrecompiledTouch": {
+					"subnumbers": ["1", "2"],
+					"chain": "St. Peter's (test)"
+				}
+			}
+		}
+	]
 }

ethcore/spec/src/genesis.rs

@@ -20,6 +20,7 @@ use keccak_hash::KECCAK_NULL_RLP;
 use crate::seal::Seal;
 
 /// Genesis components.
+#[derive(Debug)]
 pub struct Genesis {
 	/// Seal.
 	pub seal: Seal,

ethcore/spec/src/seal.rs

@@ -21,6 +21,7 @@ use ethereum_types::{H64, H256, H520};
 use ethjson;
 
 /// Classic ethereum seal.
+#[derive(Debug)]
 pub struct Ethereum {
 	/// Seal nonce.
 	pub nonce: H64,
@@ -37,6 +38,7 @@ impl Into<Generic> for Ethereum {
 }
 
 /// AuthorityRound seal.
+#[derive(Debug)]
 pub struct AuthorityRound {
 	/// Seal step.
 	pub step: usize,
@@ -45,6 +47,7 @@ pub struct AuthorityRound {
 }
 
 /// Tendermint seal.
+#[derive(Debug)]
 pub struct Tendermint {
 	/// Seal round.
 	pub round: usize,
@@ -73,9 +76,11 @@ impl Into<Generic> for Tendermint {
 	}
 }
 
+#[derive(Debug)]
 pub struct Generic(pub Vec<u8>);
 
 /// Genesis seal type.
+#[derive(Debug)]
 pub enum Seal {
 	/// Classic ethereum seal.
 	Ethereum(Ethereum),

ethcore/spec/src/spec.rs

@@ -58,9 +58,6 @@ use crate::{
 	seal::Generic as GenericSeal,
 };
 
-
-
-
 /// Runtime parameters for the spec that are related to how the software should run the chain,
 /// rather than integral properties of the chain itself.
 pub struct SpecParams<'a> {
@@ -134,53 +131,56 @@ fn run_constructors<T: Backend>(
 	let start_nonce = engine.account_start_nonce(0);
 
 	let mut state = State::from_existing(db, root, start_nonce, factories.clone())?;
-
-	// Execute contract constructors.
-	let env_info = EnvInfo {
-		number: 0,
-		author,
-		timestamp,
-		difficulty,
-		last_hashes: Default::default(),
-		gas_used: U256::zero(),
-		gas_limit: U256::max_value(),
-	};
-
-	let from = Address::zero();
-	for &(ref address, ref constructor) in constructors.iter() {
-		trace!(target: "spec", "run_constructors: Creating a contract at {}.", address);
-		trace!(target: "spec", "  .. root before = {}", state.root());
-		let params = ActionParams {
-			code_address: address.clone(),
-			code_hash: Some(keccak(constructor)),
-			code_version: U256::zero(),
-			address: address.clone(),
-			sender: from.clone(),
-			origin: from.clone(),
-			gas: U256::max_value(),
-			gas_price: Default::default(),
-			value: ActionValue::Transfer(Default::default()),
-			code: Some(Arc::new(constructor.clone())),
-			data: None,
-			call_type: CallType::None,
-			params_type: ParamsType::Embedded,
+	if constructors.is_empty() {
+		state.populate_from(genesis_state.clone());
+		let _ = state.commit()?;
+	} else {
+		// Execute contract constructors.
+		let env_info = EnvInfo {
+			number: 0,
+			author,
+			timestamp,
+			difficulty,
+			last_hashes: Default::default(),
+			gas_used: U256::zero(),
+			gas_limit: U256::max_value(),
 		};
 
-		let mut substate = Substate::new();
+		let from = Address::zero();
+		for &(ref address, ref constructor) in constructors.iter() {
+			trace!(target: "spec", "run_constructors: Creating a contract at {}.", address);
+			trace!(target: "spec", "  .. root before = {}", state.root());
+			let params = ActionParams {
+				code_address: address.clone(),
+				code_hash: Some(keccak(constructor)),
+				code_version: U256::zero(),
+				address: address.clone(),
+				sender: from.clone(),
+				origin: from.clone(),
+				gas: U256::max_value(),
+				gas_price: Default::default(),
+				value: ActionValue::Transfer(Default::default()),
+				code: Some(Arc::new(constructor.clone())),
+				data: None,
+				call_type: CallType::None,
+				params_type: ParamsType::Embedded,
+			};
+
+			let mut substate = Substate::new();
 
-		{
-			let machine = engine.machine();
-			let schedule = machine.schedule(env_info.number);
-			let mut exec = Executive::new(&mut state, &env_info, &machine, &schedule);
-			// failing create is not a bug
-			if let Err(e) = exec.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer) {
-				warn!(target: "spec", "Genesis constructor execution at {} failed: {}.", address, e);
+			{
+				let machine = engine.machine();
+				let schedule = machine.schedule(env_info.number);
+				let mut exec = Executive::new(&mut state, &env_info, &machine, &schedule);
+				// failing create is not a bug
+				if let Err(e) = exec.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer) {
+					warn!(target: "spec", "Genesis constructor execution at {} failed: {}.", address, e);
+				}
 			}
-		}
 
-		let _ = state.commit()?;
+			let _ = state.commit()?;
+		}
 	}
-
 	Ok(state.drop())
 }
 
@@ -219,7 +219,7 @@ pub struct Spec {
 	pub hardcoded_sync: Option<SpecHardcodedSync>,
 	/// Contract constructors to be executed on genesis.
 	pub constructors: Vec<(Address, Bytes)>,
-	/// May be prepopulated if we know this in advance.
+	/// May be pre-populated if we know this in advance.
 	pub state_root: H256,
 	/// Genesis state as plain old data.
 	pub genesis_state: PodState,