From 3ae867bdd6e5b55a67463d133a49dde421d99cb5 Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Fri, 17 Aug 2018 12:24:40 -0700 Subject: [PATCH] fixups --- src/erasure.rs | 16 ++++++---------- tests/multinode.rs | 3 ++- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/erasure.rs b/src/erasure.rs index 3ed23c0a9a..a0eb6132da 100644 --- a/src/erasure.rs +++ b/src/erasure.rs @@ -84,7 +84,7 @@ pub fn generate_coding_blocks(coding: &mut [&mut [u8]], data: &[&[u8]]) -> Resul let mut data_arg = Vec::with_capacity(data.len()); for block in data { if block_len != block.len() as i32 { - trace!( + error!( "data block size incorrect {} expected {}", block.len(), block_len @@ -96,7 +96,7 @@ pub fn generate_coding_blocks(coding: &mut [&mut [u8]], data: &[&[u8]]) -> Resul let mut coding_arg = Vec::with_capacity(coding.len()); for mut block in coding { if block_len != block.len() as i32 { - trace!( + error!( "coding block size incorrect {} expected {}", block.len(), block_len @@ -587,11 +587,9 @@ pub fn recover( data_size = locks[n].get_data_size().unwrap() as usize; data_size -= BLOB_HEADER_SIZE; if data_size > BLOB_DATA_SIZE { - trace!( + error!( "{:x} corrupt data blob[{}] data_size: {}", - debug_id, - idx, - data_size + debug_id, idx, data_size ); corrupt = true; } @@ -601,11 +599,9 @@ pub fn recover( locks[n].set_index(idx).unwrap(); if data_size - BLOB_HEADER_SIZE > BLOB_DATA_SIZE { - trace!( + error!( "{:x} corrupt coding blob[{}] data_size: {}", - debug_id, - idx, - data_size + debug_id, idx, data_size ); corrupt = true; } diff --git a/tests/multinode.rs b/tests/multinode.rs index 22d6794ddb..bf8deef061 100644 --- a/tests/multinode.rs +++ b/tests/multinode.rs @@ -643,7 +643,8 @@ fn test_multi_node_dynamic_network() { expected_balance += 500; - assert!(client.poll_for_signature(&sig).is_ok()); + let e = client.poll_for_signature(&sig); + assert!(e.is_ok(), "err: {:?}", e); let now = Instant::now(); let mut finality = client.get_finality();