692d5b4e08
* Add constantinople conf to EvmTestClient. * Skip some test to update submodule etheureum/tests submodule to latest. * Put skipping 'under issue' test behind a feature. * Change blockReward for const-test to pass ethereum/tests * Update tests to new constantinple definition (change of reward at block 5). Switch 'reference' to string, that way we can include issues from others repo (more flexible)Update tests to new constantinple definition (change of reward at block 5). Switch 'reference' to string, that way we can include issues from others repo (more flexible). * Fix modexp and bn128_mul gas prices in chain config * Changes `run_test_path` method to append its directory results (without that it stop testing at the first file failure). Add some missing tests. Add skip for those (block create2 is one hundred percent false but on hive we can see that geth and aleth got similar issue for this item). * retab current.json * Update reference to parity issue for failing tests.
124 lines
3.3 KiB
Rust
124 lines
3.3 KiB
Rust
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Additional test structures deserialization.
|
|
|
|
use std::collections::BTreeMap;
|
|
use std::io::Read;
|
|
use serde_json;
|
|
use serde_json::Error;
|
|
use hash::H256;
|
|
use uint::Uint;
|
|
|
|
/// Blockchain test header deserializer.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
pub struct DifficultyTestCase {
|
|
/// Parent timestamp.
|
|
#[serde(rename="parentTimestamp")]
|
|
pub parent_timestamp: Uint,
|
|
/// Parent difficulty.
|
|
#[serde(rename="parentDifficulty")]
|
|
pub parent_difficulty: Uint,
|
|
/// Parent uncle hash.
|
|
#[serde(rename="parentUncles")]
|
|
pub parent_uncles: H256,
|
|
/// Current timestamp.
|
|
#[serde(rename="currentTimestamp")]
|
|
pub current_timestamp: Uint,
|
|
/// Current difficulty.
|
|
#[serde(rename="currentDifficulty")]
|
|
pub current_difficulty: Uint,
|
|
/// Current block number.
|
|
#[serde(rename="currentBlockNumber")]
|
|
pub current_block_number: Uint,
|
|
}
|
|
|
|
/// Blockchain test deserializer.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
pub struct DifficultyTest(BTreeMap<String, DifficultyTestCase>);
|
|
|
|
impl IntoIterator for DifficultyTest {
|
|
type Item = <BTreeMap<String, DifficultyTestCase> as IntoIterator>::Item;
|
|
type IntoIter = <BTreeMap<String, DifficultyTestCase> as IntoIterator>::IntoIter;
|
|
|
|
fn into_iter(self) -> Self::IntoIter {
|
|
self.0.into_iter()
|
|
}
|
|
}
|
|
|
|
impl DifficultyTest {
|
|
/// Loads test from json.
|
|
pub fn load<R>(reader: R) -> Result<Self, Error> where R: Read {
|
|
serde_json::from_reader(reader)
|
|
}
|
|
}
|
|
|
|
/// Test to skip (only if issue ongoing)
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
pub struct SkipStates {
|
|
/// Block tests
|
|
pub block: Vec<BlockSkipStates>,
|
|
/// State tests
|
|
pub state: Vec<StateSkipStates>,
|
|
|
|
}
|
|
|
|
/// Block test to skip.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
pub struct BlockSkipStates {
|
|
/// Issue reference.
|
|
pub reference: String,
|
|
/// Test failing name.
|
|
pub failing: String,
|
|
/// Items failing for the test.
|
|
pub subtests: Vec<String>,
|
|
}
|
|
|
|
/// State test to skip.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
pub struct StateSkipStates {
|
|
/// Issue reference.
|
|
pub reference: String,
|
|
/// Test failing name.
|
|
pub failing: String,
|
|
/// Items failing for the test.
|
|
pub subtests: BTreeMap<String, StateSkipSubStates>
|
|
}
|
|
|
|
/// State subtest to skip.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
pub struct StateSkipSubStates {
|
|
/// State test number of this item. Or '*' for all state.
|
|
pub subnumbers: Vec<String>,
|
|
/// Chain for this items.
|
|
pub chain: String,
|
|
}
|
|
|
|
impl SkipStates {
|
|
/// Loads skip states from json.
|
|
pub fn load<R>(reader: R) -> Result<Self, Error> where R: Read {
|
|
serde_json::from_reader(reader)
|
|
}
|
|
|
|
/// Empty skip states.
|
|
pub fn empty() -> Self {
|
|
SkipStates {
|
|
block: Vec::new(),
|
|
state: Vec::new(),
|
|
}
|
|
}
|
|
}
|