grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test for triples and bug fix

Browse Source
This commit is contained in:
Nikolay Volf 2016-04-17 19:12:10 +03:00
parent 3138584320
commit bde0a5b811
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/src/bytes.rs
View File

@ -410,7 +410,7 @@ impl<'a, V1, V2, T3> ToBytesWithMap for (&'a Vec<V1>, &'a Vec<V2>, &'a T3)
mem::size_of::<T3>() mem::size_of::<T3>()
); );
result.extend(((self.0.len() * v1_size) as u64).to_bytes_map()); result.extend(((self.0.len() * v1_size) as u64).to_bytes_map());
result.extend(((self.1.len() * v1_size) as u64).to_bytes_map()); result.extend(((self.1.len() * v2_size) as u64).to_bytes_map());
for i in 0..self.0.len() { for i in 0..self.0.len() {
result.extend(self.0[i].to_bytes_map()); result.extend(self.0[i].to_bytes_map());
} }
@ -516,3 +516,19 @@ fn raw_bytes_from_tuple() {
let bytes_to = tup_to.to_bytes_map(); let bytes_to = tup_to.to_bytes_map();
assert_eq!(bytes_to, bytes); assert_eq!(bytes_to, bytes);
} }
#[test]
fn bytes_map_from_triple() {
let data = (vec![2u16; 6], vec![6u32; 3], 12u64);
let bytes_map = (&data.0, &data.1, &data.2).to_bytes_map();
assert_eq!(bytes_map, vec![
// data map 2 x u64
12, 0, 0, 0, 0, 0, 0, 0,
12, 0, 0, 0, 0, 0, 0, 0,
// vec![2u16; 6]
2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0,
// vec![6u32; 3]
6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
// 12u64
12, 0, 0, 0, 0, 0, 0, 0]);
}