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

Fix and some tests for opaque types in populatable.

Browse Source
This commit is contained in:
Gav Wood 2016-01-08 12:02:26 +01:00
parent 3018c4a28a
commit f81fb2de51
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bytes.rs
View File

@ -334,14 +334,6 @@ pub trait Populatable {
self.as_slice_mut().write(&d).unwrap(); self.as_slice_mut().write(&d).unwrap();
} }
/// Copies a bunch of bytes `d` to `self`, overwriting as necessary.
///
/// If `d` is smaller, will leave some bytes untouched.
fn fax_right_raw(&mut self, d: &[u8]) {
use std::io::Write;
self.as_slice_mut().write(&d).unwrap();
}
/// Copies the raw representation of an object `d` to `self`, overwriting as necessary. /// Copies the raw representation of an object `d` to `self`, overwriting as necessary.
/// ///
/// If `d` is smaller, zero-out the remaining bytes. /// If `d` is smaller, zero-out the remaining bytes.
@ -350,7 +342,7 @@ pub trait Populatable {
/// Copies the raw representation of an object `d` to `self`, overwriting as necessary. /// Copies the raw representation of an object `d` to `self`, overwriting as necessary.
/// ///
/// If `d` is smaller, will leave some bytes untouched. /// If `d` is smaller, will leave some bytes untouched.
fn fax_raw_from(&mut self, d: &BytesConvertable) { self.populate_raw(d.as_slice()); } fn fax_raw_from(&mut self, d: &BytesConvertable) { self.fax_raw(d.as_slice()); }
/// Get the raw slice for this object. /// Get the raw slice for this object.
fn as_slice_mut(&mut self) -> &mut [u8]; fn as_slice_mut(&mut self) -> &mut [u8];
@ -413,3 +405,15 @@ fn fax_raw_dyn() {
x.fax_raw(&[1u8; 6][..]); x.fax_raw(&[1u8; 6][..]);
assert_eq!(&x[..], [1u8, 1, 1, 1]); assert_eq!(&x[..], [1u8, 1, 1, 1]);
} }
#[test]
fn populate_big_types() {
use hash::*;
let a = address_from_hex("ffffffffffffffffffffffffffffffffffffffff");
let mut h = h256_from_u64(0x69);
h.populate_raw_from(&a);
assert_eq!(h, h256_from_hex("ffffffffffffffffffffffffffffffffffffffff000000000000000000000000"));
let mut h = h256_from_u64(0x69);
h.fax_raw_from(&a);
assert_eq!(h, h256_from_hex("ffffffffffffffffffffffffffffffffffffffff000000000000000000000069"));
}