From 53c2cbc631b30d8919d0b393e0da6f5ac238fabd Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Fri, 29 Jan 2016 13:16:53 +0400 Subject: [PATCH] moved common code to helpers --- src/tests/helpers.rs | 15 +++++++++++++++ src/verification.rs | 23 +---------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/tests/helpers.rs b/src/tests/helpers.rs index a566392cc..fd3302ffe 100644 --- a/src/tests/helpers.rs +++ b/src/tests/helpers.rs @@ -44,6 +44,21 @@ pub fn create_test_block(header: &Header) -> Bytes { rlp.out() } +pub fn create_test_block_with_data(header: &Header, transactions: &[&Transaction], uncles: &[Header]) -> Bytes { + let mut rlp = RlpStream::new_list(3); + rlp.append(header); + rlp.append_list(transactions.len()); + for t in transactions { + rlp.append_raw(&t.rlp_bytes_opt(Seal::With), 1); + } + rlp.append_list(uncles.len()); + for h in uncles { + rlp.append(h); + } + rlp.out() +} + + pub fn generate_dummy_client(block_number: usize) -> Arc { let dir = RandomTempPath::new(); diff --git a/src/verification.rs b/src/verification.rs index 158f28f95..368ff84e9 100644 --- a/src/verification.rs +++ b/src/verification.rs @@ -221,28 +221,7 @@ mod tests { use spec::*; use transaction::*; use basic_types::*; - - fn create_test_block(header: &Header) -> Bytes { - let mut rlp = RlpStream::new_list(3); - rlp.append(header); - rlp.append_raw(&rlp::EMPTY_LIST_RLP, 1); - rlp.append_raw(&rlp::EMPTY_LIST_RLP, 1); - rlp.out() - } - - fn create_test_block_with_data(header: &Header, transactions: &[&Transaction], uncles: &[Header]) -> Bytes { - let mut rlp = RlpStream::new_list(3); - rlp.append(header); - rlp.append_list(transactions.len()); - for t in transactions { - rlp.append_raw(&t.rlp_bytes_opt(Seal::With), 1); - } - rlp.append_list(uncles.len()); - for h in uncles { - rlp.append(h); - } - rlp.out() - } + use tests::helpers::*; fn check_ok(result: Result<(), Error>) { result.unwrap_or_else(|e| panic!("Block verification failed: {:?}", e));