* cargo upgrade "ethereum-types" --all --allow-prerelease * [ethash] fix compilation errors * [ethkey] fix compilation errors * [journaldb] fix compilation errors * [dir] fix compilation errors * [ethabi] update to 0.7 * wip * [eip-712] fix compilation errors * [ethjson] fix compilation errors * [Cargo.toml] add TODO to remove patches * [ethstore] fix compilation errors * use patched keccak-hash with new primitive-types * wip * [ethcore-network-devp2p] fix compilation errors * [vm] fix compilation errors * [common-types, evm, wasm] fix compilation errors * [ethcore-db] Require AsRef instead of Deref for keys * [ethcore-blockchain] fix some compilation errors * [blooms-db] fix compilation errors Thanks a lot @dvdplm :) * we don't need no rlp ethereum feature * [ethcore] fix some compilation errors * [parity-ipfs-api] fix compilation error * [ethcore-light] fix compilation errors * [Cargo.lock] update parity-common * [ethcore-private-tx] fix some compilation errors * wip * [ethcore-private-tx] fix compilation errors * [parity-updater] fix compilation errors * [parity-rpc] fix compilation errors * [parity-bin] fix other compilation errors * update to new ethereum-types * update keccak-hash * [fastmap] fix compilation in tests * [blooms-db] fix compilation in tests * [common-types] fix compilation in tests * [triehash-ethereum] fix compilation in tests * [ethkey] fix compilation in tests * [pwasm-run-test] fix compilation errors * [wasm] fix compilation errors * [ethjson] fix compilation in tests * [eip-712] fix compilation in tests * [ethcore-blockchain] fix compilation in tests * [ethstore] fix compilation in tests * [ethstore-accounts] fix compilation in tests * [parity-hash-fetch] fix compilation in tests * [parity-whisper] fix compilation in tests * [ethcore-miner] fix compilation in tests * [ethcore-network-devp2p] fix compilation in tests * [*] upgrade rand to 0.6 * [evm] get rid of num-bigint conversions * [ethcore] downgrade trie-standardmap and criterion * [ethcore] fix some warnings * [ethcore] fix compilation in tests * [evmbin] fix compilation in tests * [updater] fix compilation in tests * [ethash] fix compilation in tests * [ethcore-secretstore] fix compilation in tests * [ethcore-sync] fix compilation in tests * [parity-rpc] fix compilation in tests * [ethcore] finally fix compilation in tests FUCK YEAH!!! * [ethstore] lazy_static is unused * [ethcore] fix test * fix up bad merge * [Cargo.toml] remove unused patches * [*] replace some git dependencies with crates.io * [Cargo.toml] remove unused lazy_static * [*] clean up * [ethcore] fix transaction_filter_deprecated test * [private-tx] fix serialization tests * fix more serialization tests * [ethkey] fix smoky test * [rpc] fix tests, please? * [ethcore] remove commented out code * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * [ethstore] remove unused dev-dependency * [ethcore] remove resolved TODO * [*] resolve keccak-hash TODO * [*] s/Address::default()/Address::zero() * [rpc] remove Subscribers::new_test * [rpc] remove EthPubSubClient::new_test * [ethcore] use trie-standardmap from crates.io * [dir] fix db_root_path * [ethcore] simplify snapshot::tests::helpers::fill_storage * Apply suggestions from code review Co-Authored-By: David <dvdplm@gmail.com> * [ethcore-secretstore] resolve TODO in serialization * [ethcore-network-devp2p] resolve TODO in save_key * [Cargo.lock] update triehash * [*] use ethabi from crates.io * [ethkey] use secp256k1 from master branch * [Cargo.lock] update eth-secp256k1
110 lines
3.6 KiB
Rust
110 lines
3.6 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum 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 Ethereum 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 Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use ethjson;
|
|
use trie::{TrieFactory, TrieSpec};
|
|
use ethtrie::RlpCodec;
|
|
use ethereum_types::H256;
|
|
|
|
use super::HookType;
|
|
|
|
pub use self::generic::run_test_path as run_generic_test_path;
|
|
pub use self::generic::run_test_file as run_generic_test_file;
|
|
pub use self::secure::run_test_path as run_secure_test_path;
|
|
pub use self::secure::run_test_file as run_secure_test_file;
|
|
|
|
fn test_trie<H: FnMut(&str, HookType)>(json: &[u8], trie: TrieSpec, start_stop_hook: &mut H) -> Vec<String> {
|
|
let tests = ethjson::trie::Test::load(json).unwrap();
|
|
let factory = TrieFactory::<_, RlpCodec>::new(trie);
|
|
let mut result = vec![];
|
|
|
|
for (name, test) in tests.into_iter() {
|
|
start_stop_hook(&name, HookType::OnStart);
|
|
|
|
let mut memdb = journaldb::new_memory_db();
|
|
let mut root = H256::zero();
|
|
let mut t = factory.create(&mut memdb, &mut root);
|
|
|
|
for (key, value) in test.input.data.into_iter() {
|
|
let key: Vec<u8> = key.into();
|
|
let value: Vec<u8> = value.map_or_else(Vec::new, Into::into);
|
|
t.insert(&key, &value)
|
|
.expect(&format!("Trie test '{:?}' failed due to internal error", name));
|
|
}
|
|
|
|
if *t.root() != test.root.into() {
|
|
result.push(format!("Trie test '{:?}' failed.", name));
|
|
}
|
|
|
|
start_stop_hook(&name, HookType::OnStop);
|
|
}
|
|
|
|
for i in &result {
|
|
println!("FAILED: {}", i);
|
|
}
|
|
|
|
result
|
|
}
|
|
|
|
mod generic {
|
|
use std::path::Path;
|
|
use trie::TrieSpec;
|
|
|
|
use super::HookType;
|
|
|
|
/// Run generic trie jsontests on a given folder.
|
|
pub fn run_test_path<H: FnMut(&str, HookType)>(p: &Path, skip: &[&'static str], h: &mut H) {
|
|
::json_tests::test_common::run_test_path(p, skip, do_json_test, h)
|
|
}
|
|
|
|
/// Run generic trie jsontests on a given file.
|
|
pub fn run_test_file<H: FnMut(&str, HookType)>(p: &Path, h: &mut H) {
|
|
::json_tests::test_common::run_test_file(p, do_json_test, h)
|
|
}
|
|
|
|
fn do_json_test<H: FnMut(&str, HookType)>(json: &[u8], h: &mut H) -> Vec<String> {
|
|
super::test_trie(json, TrieSpec::Generic, h)
|
|
}
|
|
|
|
declare_test!{TrieTests_trietest, "TrieTests/trietest"}
|
|
declare_test!{TrieTests_trieanyorder, "TrieTests/trieanyorder"}
|
|
}
|
|
|
|
mod secure {
|
|
use std::path::Path;
|
|
use trie::TrieSpec;
|
|
|
|
use super::HookType;
|
|
|
|
/// Run secure trie jsontests on a given folder.
|
|
pub fn run_test_path<H: FnMut(&str, HookType)>(p: &Path, skip: &[&'static str], h: &mut H) {
|
|
::json_tests::test_common::run_test_path(p, skip, do_json_test, h)
|
|
}
|
|
|
|
/// Run secure trie jsontests on a given file.
|
|
pub fn run_test_file<H: FnMut(&str, HookType)>(p: &Path, h: &mut H) {
|
|
::json_tests::test_common::run_test_file(p, do_json_test, h)
|
|
}
|
|
|
|
fn do_json_test<H: FnMut(&str, HookType)>(json: &[u8], h: &mut H) -> Vec<String> {
|
|
super::test_trie(json, TrieSpec::Secure, h)
|
|
}
|
|
|
|
declare_test!{TrieTests_hex_encoded_secure, "TrieTests/hex_encoded_securetrie_test"}
|
|
declare_test!{TrieTests_trietest_secure, "TrieTests/trietest_secureTrie"}
|
|
declare_test!{TrieTests_trieanyorder_secure, "TrieTests/trieanyorder_secureTrie"}
|
|
}
|