-
Notifications
You must be signed in to change notification settings - Fork 257
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Transaction primitives #39
Changes from 5 commits
91ff2c7
e490b79
2d8b1fe
0c81695
1f11c40
cc183ef
2d2e4aa
9282c7d
61ce4dd
9b06205
d707ebd
7ff32b0
e25b614
c9b23df
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,16 @@ | ||
#[cfg(test)] | ||
mod tests { | ||
#[test] | ||
fn it_works() { | ||
assert_eq!(2 + 2, 4); | ||
} | ||
#[macro_use] | ||
extern crate lazy_static; | ||
|
||
extern crate blake2_rfc; | ||
extern crate byteorder; | ||
extern crate pairing; | ||
extern crate sapling_crypto; | ||
|
||
use sapling_crypto::jubjub::JubjubBls12; | ||
|
||
mod serialize; | ||
pub mod transaction; | ||
|
||
lazy_static! { | ||
static ref JUBJUB: JubjubBls12 = { JubjubBls12::new() }; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,154 @@ | ||
use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt}; | ||
use std::io::{self, Read, Write}; | ||
|
||
struct CompactSize; | ||
|
||
impl CompactSize { | ||
fn read<R: Read>(mut reader: R) -> io::Result<usize> { | ||
let flag = reader.read_u8()?; | ||
match if flag < 253 { | ||
Ok(flag as usize) | ||
} else if flag == 253 { | ||
match reader.read_u16::<LittleEndian>()? { | ||
n if n < 253 => Err(io::Error::new( | ||
io::ErrorKind::InvalidInput, | ||
"non-canonical CompactSize", | ||
)), | ||
n => Ok(n as usize), | ||
} | ||
} else if flag == 254 { | ||
match reader.read_u32::<LittleEndian>()? { | ||
n if n < 0x10000 => Err(io::Error::new( | ||
io::ErrorKind::InvalidInput, | ||
"non-canonical CompactSize", | ||
)), | ||
n => Ok(n as usize), | ||
} | ||
} else { | ||
match reader.read_u64::<LittleEndian>()? { | ||
n if n < 0x100000000 => Err(io::Error::new( | ||
io::ErrorKind::InvalidInput, | ||
"non-canonical CompactSize", | ||
)), | ||
n => Ok(n as usize), | ||
} | ||
}? { | ||
s if s > 0x02000000 => Err(io::Error::new( | ||
io::ErrorKind::InvalidInput, | ||
"CompactSize too large", | ||
)), | ||
s => Ok(s), | ||
} | ||
} | ||
|
||
fn write<W: Write>(mut writer: W, size: usize) -> io::Result<()> { | ||
match size { | ||
s if s < 253 => writer.write_u8(s as u8), | ||
s if s <= 0xFFFF => { | ||
writer.write_u8(253)?; | ||
writer.write_u16::<LittleEndian>(s as u16) | ||
} | ||
s if s <= 0xFFFFFFFF => { | ||
writer.write_u8(254)?; | ||
writer.write_u32::<LittleEndian>(s as u32) | ||
} | ||
s => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this fail if There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we know what the rationale was for that? (I'd be terrified to change it, mind :-) ) |
||
writer.write_u8(255)?; | ||
writer.write_u64::<LittleEndian>(s as u64) | ||
} | ||
} | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I reviewed that these exactly match the behaviour of the C++ code. |
||
|
||
pub struct Vector; | ||
|
||
impl Vector { | ||
pub fn read<R: Read, E, F>(mut reader: R, func: F) -> io::Result<Vec<E>> | ||
where | ||
F: Fn(&mut R) -> io::Result<E>, | ||
{ | ||
let count = CompactSize::read(&mut reader)?; | ||
(0..count).into_iter().map(|_| func(&mut reader)).collect() | ||
} | ||
|
||
pub fn write<W: Write, E, F>(mut writer: W, vec: &Vec<E>, func: F) -> io::Result<()> | ||
ebfull marked this conversation as resolved.
Show resolved
Hide resolved
|
||
where | ||
F: Fn(&mut W, &E) -> io::Result<()>, | ||
{ | ||
CompactSize::write(&mut writer, vec.len())?; | ||
vec.iter().map(|e| func(&mut writer, e)).collect() | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
|
||
#[test] | ||
fn compact_size() { | ||
macro_rules! eval { | ||
($value:expr, $expected:expr) => { | ||
let mut data = vec![]; | ||
CompactSize::write(&mut data, $value).unwrap(); | ||
assert_eq!(&data[..], &$expected[..]); | ||
match CompactSize::read(&data[..]) { | ||
Ok(n) => assert_eq!(n, $value), | ||
Err(e) => panic!("Unexpected error: {:?}", e), | ||
} | ||
}; | ||
} | ||
|
||
eval!(0, [0]); | ||
eval!(1, [1]); | ||
eval!(252, [252]); | ||
eval!(253, [253, 253, 0]); | ||
eval!(254, [253, 254, 0]); | ||
eval!(255, [253, 255, 0]); | ||
eval!(256, [253, 0, 1]); | ||
eval!(256, [253, 0, 1]); | ||
eval!(65535, [253, 255, 255]); | ||
eval!(65536, [254, 0, 0, 1, 0]); | ||
eval!(65537, [254, 1, 0, 1, 0]); | ||
|
||
eval!(33554432, [254, 0, 0, 0, 2]); | ||
|
||
{ | ||
let value = 33554433; | ||
let encoded = &[254, 1, 0, 0, 2][..]; | ||
let mut data = vec![]; | ||
CompactSize::write(&mut data, value).unwrap(); | ||
assert_eq!(&data[..], encoded); | ||
assert!(CompactSize::read(encoded).is_err()); | ||
} | ||
} | ||
|
||
#[test] | ||
fn vector() { | ||
macro_rules! eval { | ||
($value:expr, $expected:expr) => { | ||
let mut data = vec![]; | ||
Vector::write(&mut data, &$value, |w, e| w.write_u8(*e)).unwrap(); | ||
assert_eq!(&data[..], &$expected[..]); | ||
match Vector::read(&data[..], |r| r.read_u8()) { | ||
Ok(v) => assert_eq!(v, $value), | ||
Err(e) => panic!("Unexpected error: {:?}", e), | ||
} | ||
}; | ||
} | ||
|
||
eval!(vec![], [0]); | ||
eval!(vec![0], [1, 0]); | ||
eval!(vec![1], [1, 1]); | ||
eval!(vec![5; 8], [8, 5, 5, 5, 5, 5, 5, 5, 5]); | ||
|
||
{ | ||
// expected = [253, 4, 1, 7, 7, 7, ...] | ||
let mut expected = vec![7; 263]; | ||
expected[0] = 253; | ||
expected[1] = 4; | ||
expected[2] = 1; | ||
|
||
eval!(vec![7; 260], expected); | ||
} | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps make a constant for
0x02000000
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's called
MAX_SIZE
insrc/serialize.h
.