octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move block type tests and proptest support impls to block::tests

This commit is contained in:
Deirdre Connolly 2020-02-01 00:27:51 -05:00 committed by Deirdre Connolly
parent 6508540a92
commit 36e9bb162f
2 changed files with 139 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
zebra-chain/src/block.rs
View File

@ -2,6 +2,8 @@
#[cfg(test)]
pub mod test_vectors;
#[cfg(test)]
mod tests;
use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
use chrono::{DateTime, TimeZone, Utc};
@ -151,7 +153,7 @@ impl ZcashDeserialize for BlockHeader {
/// Block header: a data structure containing the block's metadata
/// Transactions: an array (vector in Rust) of transactions
#[derive(Clone, Debug, Eq, PartialEq)]
//#[cfg_attr(test, derive(Arbitrary))]
#[cfg_attr(test, derive(Arbitrary))]
pub struct Block {
/// First 80 bytes of the block as defined by the encoding used by
/// "block" messages.
@ -177,79 +179,3 @@ impl ZcashDeserialize for Block {
})
}
}
#[cfg(test)]
mod tests {
use std::io::{Cursor, Write};
use chrono::NaiveDateTime;
use proptest::prelude::*;
use crate::sha256d_writer::Sha256dWriter;
use super::*;
#[test]
fn blockheaderhash_debug() {
let preimage = b"foo bar baz";
let mut sha_writer = Sha256dWriter::default();
let _ = sha_writer.write_all(preimage);
let hash = BlockHeaderHash(sha_writer.finish());
assert_eq!(
format!("{:?}", hash),
"BlockHeaderHash(\"bf46b4b5030752fedac6f884976162bbfb29a9398f104a280b3e34d51b416631\")"
);
}
#[test]
fn blockheaderhash_from_blockheader() {
let some_bytes = [0; 32];
let blockheader = BlockHeader {
previous_block_hash: BlockHeaderHash(some_bytes),
merkle_root_hash: MerkleTreeRootHash(some_bytes),
final_sapling_root_hash: SaplingNoteTreeRootHash(some_bytes),
time: DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(61, 0), Utc),
bits: 0,
nonce: some_bytes,
solution: EquihashSolution([0; 1344]),
};
let hash = BlockHeaderHash::from(blockheader);
assert_eq!(
format!("{:?}", hash),
"BlockHeaderHash(\"738948d714d44f3040c2b6809ba7dbc8f4ba673dad39fd755ea4aeaa514cc386\")"
);
let mut bytes = Cursor::new(Vec::new());
// rustc keeps telling me I can't use `?` here, but unwrap() works fine???
blockheader.zcash_serialize(&mut bytes).unwrap();
bytes.set_position(0);
// rustc keeps telling me I can't use `?` here, but unwrap() works fine???
let other_header = BlockHeader::zcash_deserialize(&mut bytes).unwrap();
assert_eq!(blockheader, other_header);
}
proptest! {
#[test]
fn blockheaderhash_roundtrip(hash in any::<BlockHeaderHash>()) {
let mut bytes = Cursor::new(Vec::new());
hash.zcash_serialize(&mut bytes)?;
bytes.set_position(0);
let other_hash = BlockHeaderHash::zcash_deserialize(&mut bytes)?;
prop_assert_eq![hash, other_hash];
}
}
}

136
zebra-chain/src/block/tests.rs Normal file
View File

@ -0,0 +1,136 @@
use std::io::{Cursor, Write};
use chrono::NaiveDateTime;
use proptest::{
arbitrary::{any, Arbitrary},
collection::vec,
option,
prelude::*,
};
use crate::sha256d_writer::Sha256dWriter;
use super::*;
#[cfg(test)]
impl Arbitrary for BlockHeader {
type Parameters = ();
fn arbitrary_with(_args: ()) -> Self::Strategy {
(
any::<BlockHeaderHash>(),
any::<MerkleTreeRootHash>(),
any::<SaplingNoteTreeRootHash>(),
(0i64..4_294_967_296i64),
any::<u32>(),
any::<[u8; 32]>(),
any::<EquihashSolution>(),
)
.prop_map(
|(
block_hash,
merkle_root_hash,
sapling_root_hash,
timestamp,
bits,
nonce,
equihash_solution,
)| BlockHeader {
previous_block_hash: block_hash,
merkle_root_hash: merkle_root_hash,
final_sapling_root_hash: sapling_root_hash,
time: Utc.timestamp(timestamp, 0),
bits: bits,
nonce: nonce,
solution: equihash_solution,
},
)
.boxed()
}
type Strategy = BoxedStrategy<Self>;
}
#[test]
fn blockheaderhash_debug() {
let preimage = b"foo bar baz";
let mut sha_writer = Sha256dWriter::default();
let _ = sha_writer.write_all(preimage);
let hash = BlockHeaderHash(sha_writer.finish());
assert_eq!(
format!("{:?}", hash),
"BlockHeaderHash(\"bf46b4b5030752fedac6f884976162bbfb29a9398f104a280b3e34d51b416631\")"
);
}
#[test]
fn blockheaderhash_from_blockheader() {
let some_bytes = [0; 32];
let blockheader = BlockHeader {
previous_block_hash: BlockHeaderHash(some_bytes),
merkle_root_hash: MerkleTreeRootHash(some_bytes),
final_sapling_root_hash: SaplingNoteTreeRootHash(some_bytes),
time: DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(61, 0), Utc),
bits: 0,
nonce: some_bytes,
solution: EquihashSolution([0; 1344]),
};
let hash = BlockHeaderHash::from(blockheader);
assert_eq!(
format!("{:?}", hash),
"BlockHeaderHash(\"738948d714d44f3040c2b6809ba7dbc8f4ba673dad39fd755ea4aeaa514cc386\")"
);
let mut bytes = Cursor::new(Vec::new());
// rustc keeps telling me I can't use `?` here, but unwrap() works fine???
blockheader.zcash_serialize(&mut bytes).unwrap();
bytes.set_position(0);
// rustc keeps telling me I can't use `?` here, but unwrap() works fine???
let other_header = BlockHeader::zcash_deserialize(&mut bytes).unwrap();
assert_eq!(blockheader, other_header);
}
proptest! {
#[test]
fn blockheaderhash_roundtrip(hash in any::<BlockHeaderHash>()) {
let mut bytes = Cursor::new(Vec::new());
hash.zcash_serialize(&mut bytes)?;
bytes.set_position(0);
let other_hash = BlockHeaderHash::zcash_deserialize(&mut bytes)?;
prop_assert_eq![hash, other_hash];
}
#[test]
fn blockheader_roundtrip(header in any::<BlockHeader>()) {
let mut bytes = Cursor::new(Vec::new());
header.zcash_serialize(&mut bytes)?;
bytes.set_position(0);
let other_header = BlockHeader::zcash_deserialize(&mut bytes)?;
prop_assert_eq![header, other_header];
}
#[test]
fn block_roundtrip(block in any::<Block>()) {
let mut bytes = Cursor::new(Vec::new());
block.zcash_serialize(&mut bytes)?;
bytes.set_position(0);
let other_block = Block::zcash_deserialize(&mut bytes)?;
prop_assert_eq![block, other_block];
}
}