fix rebase and bump rlp in trie-standardmap

This commit is contained in:
Johann Tuffe 2018-09-13 11:16:43 +08:00
parent 19343a2d15
commit 2a710671d3
3 changed files with 4 additions and 4 deletions

View File

@ -130,7 +130,7 @@ mod test {
#[test]
fn fatdbmut_insert_remove_key_mapping() {
let mut memdb = MemoryDB::<KeccakHasher>::new();
let mut memdb = MemoryDB::<KeccakHasher, DBValue>::new();
let mut root = H256::new();
let key = [0x01u8, 0x23];
let val = [0x01u8, 0x24];
@ -139,7 +139,7 @@ mod test {
let mut t = FatDBMut::new(&mut memdb, &mut root);
t.insert(&key, &val).unwrap();
assert_eq!(t.get(&key), Ok(Some(DBValue::from_slice(&val))));
assert_eq!(t.db().get(&aux_hash), Some(DBValue::from_slice(&key)));
assert_eq!(t.db().get(&aux_hash), Some(&DBValue::from_slice(&key)));
t.remove(&key).unwrap();
assert_eq!(t.db().get(&aux_hash), None);
}

View File

@ -451,7 +451,7 @@ mod tests {
fn iterator_seek() {
let d = vec![ DBValue::from_slice(b"A"), DBValue::from_slice(b"AA"), DBValue::from_slice(b"AB"), DBValue::from_slice(b"B") ];
let mut memdb = MemoryDB::<KeccakHasher>::new();
let mut memdb = MemoryDB::<KeccakHasher, DBValue>::new();
let mut root = H256::new();
{
let mut t = TrieDBMut::new(&mut memdb, &mut root);

View File

@ -10,4 +10,4 @@ license = "GPL-3.0"
ethereum-types = "0.4"
keccak-hash = { version = "0.1", path = "../keccak-hash" }
parity-bytes = { version = "0.1", path = "../parity-bytes" }
rlp = { version = "0.2.4", path = "../rlp" }
rlp = { version = "0.3.0", path = "../rlp" }