blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixups

This commit is contained in:
Rob Walker 2018-08-17 12:24:40 -07:00
parent bc5f29150b
commit 3ae867bdd6
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/erasure.rs
View File

@ -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()); let mut data_arg = Vec::with_capacity(data.len());
for block in data { for block in data {
if block_len != block.len() as i32 { if block_len != block.len() as i32 {
trace!( error!(
"data block size incorrect {} expected {}", "data block size incorrect {} expected {}",
block.len(), block.len(),
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()); let mut coding_arg = Vec::with_capacity(coding.len());
for mut block in coding { for mut block in coding {
if block_len != block.len() as i32 { if block_len != block.len() as i32 {
trace!( error!(
"coding block size incorrect {} expected {}", "coding block size incorrect {} expected {}",
block.len(), block.len(),
block_len block_len
@ -587,11 +587,9 @@ pub fn recover(
data_size = locks[n].get_data_size().unwrap() as usize; data_size = locks[n].get_data_size().unwrap() as usize;
data_size -= BLOB_HEADER_SIZE; data_size -= BLOB_HEADER_SIZE;
if data_size > BLOB_DATA_SIZE { if data_size > BLOB_DATA_SIZE {
trace!( error!(
"{:x} corrupt data blob[{}] data_size: {}", "{:x} corrupt data blob[{}] data_size: {}",
debug_id, debug_id, idx, data_size
idx,
data_size
); );
corrupt = true; corrupt = true;
} }
@ -601,11 +599,9 @@ pub fn recover(
locks[n].set_index(idx).unwrap(); locks[n].set_index(idx).unwrap();
if data_size - BLOB_HEADER_SIZE > BLOB_DATA_SIZE { if data_size - BLOB_HEADER_SIZE > BLOB_DATA_SIZE {
trace!( error!(
"{:x} corrupt coding blob[{}] data_size: {}", "{:x} corrupt coding blob[{}] data_size: {}",
debug_id, debug_id, idx, data_size
idx,
data_size
); );
corrupt = true; corrupt = true;
} }

3
tests/multinode.rs
View File

@ -643,7 +643,8 @@ fn test_multi_node_dynamic_network() {
expected_balance += 500; 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 now = Instant::now();
let mut finality = client.get_finality(); let mut finality = client.get_finality();