trie test failing

This commit is contained in:
debris 2015-12-03 00:29:31 +01:00
parent 3143e614a8
commit 8b8a2e39e2
3 changed files with 33 additions and 16 deletions

View File

@ -4,7 +4,7 @@ use rustc_serialize::*;
use rustc_serialize::hex::FromHex;
use super::{JsonTest, JsonLoader};
pub enum OperationType {
enum OperationType {
Insert,
Remove
}
@ -26,10 +26,9 @@ struct RawOperation {
value: Option<String>
}
pub struct Operation {
pub operation: OperationType,
pub key: Vec<u8>,
pub value: Option<Vec<u8>>
pub enum Operation {
Insert(Vec<u8>, Vec<u8>),
Remove(Vec<u8>)
}
fn hex_or_string(s: &str) -> Vec<u8> {
@ -41,12 +40,9 @@ fn hex_or_string(s: &str) -> Vec<u8> {
impl Into<Operation> for RawOperation {
fn into(self) -> Operation {
Operation {
operation: self.operation,
key: hex_or_string(&self.key),
value: self.value.map(|v| {
hex_or_string(&v)
})
match self.operation {
OperationType::Insert => Operation::Insert(hex_or_string(&self.key), hex_or_string(&self.value.unwrap())),
OperationType::Remove => Operation::Remove(hex_or_string(&self.key))
}
}
}
@ -96,9 +92,9 @@ impl JsonTest for TriehashTest {
self.trietest.input()
.into_iter()
.fold(HashMap::new(), | mut map, o | {
match o.operation {
OperationType::Insert => map.insert(o.key, o.value.unwrap()),
OperationType::Remove => map.remove(&o.key)
match o {
Operation::Insert(k, v) => map.insert(k, v),
Operation::Remove(k) => map.remove(&k)
};
map
})

View File

@ -721,8 +721,11 @@ impl Trie for TrieDB {
#[cfg(test)]
mod tests {
extern crate json_tests;
use self::json_tests::*;
use rustc_serialize::hex::FromHex;
use triehash::*;
use hash::*;
use super::*;
use nibbleslice::*;
use rlp;
@ -1061,4 +1064,22 @@ mod tests {
test_all(v);
}
#[test]
fn test_trie_json() {
println!("Json trie test: ");
execute_tests_from_directory::<trie::TrieTest, _>("json-tests/json/trie/*.json", &mut | file, input, output | {
println!("file: {}", file);
let mut t = TrieDB::new_memory();
for operation in input.into_iter() {
match operation {
trie::Operation::Insert(key, value) => t.insert(&key, &value),
trie::Operation::Remove(key) => t.remove(&key)
}
}
assert_eq!(*t.root(), H256::from_slice(&output));
});
}
}

View File

@ -283,7 +283,7 @@ mod tests {
use triehash::*;
#[test]
fn test_trie_out_of_order() {
fn test_triehash_out_of_order() {
assert!(trie_root(vec![
(vec![0x01u8, 0x23], vec![0x01u8, 0x23]),
(vec![0x81u8, 0x23], vec![0x81u8, 0x23]),
@ -297,7 +297,7 @@ mod tests {
}
#[test]
fn test_trie_json() {
fn test_triehash_json() {
execute_tests_from_directory::<trie::TriehashTest, _>("json-tests/json/trie/*.json", &mut | file, input, output | {
println!("file: {}, output: {:?}", file, output);
assert_eq!(trie_root(input), H256::from_slice(&output));