From 4714dc3a5c283ce75d9113746199d8171e46e747 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Mon, 4 Mar 2019 15:16:01 -0800 Subject: [PATCH] De-pub --- core/src/.contact_info.rs.swo | Bin 0 -> 20480 bytes core/src/contact_info.rs | 2 +- core/src/erasure.rs | 10 +++------- 3 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 core/src/.contact_info.rs.swo diff --git a/core/src/.contact_info.rs.swo b/core/src/.contact_info.rs.swo new file mode 100644 index 0000000000000000000000000000000000000000..19e59a7dad3a19b6c68ce13b0c54f3fac5ae0cda GIT binary patch literal 20480 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 S-Jx1mM3s@r5@i!kt^Wn&V;1rN literal 0 HcmV?d00001 diff --git a/core/src/contact_info.rs b/core/src/contact_info.rs index c83677fbad..6d62451b1b 100644 --- a/core/src/contact_info.rs +++ b/core/src/contact_info.rs @@ -139,7 +139,7 @@ impl ContactInfo { nxt_addr.set_port(addr.port() + nxt); nxt_addr } - pub fn new_with_pubkey_socketaddr(pubkey: Pubkey, bind_addr: &SocketAddr) -> Self { + fn new_with_pubkey_socketaddr(pubkey: Pubkey, bind_addr: &SocketAddr) -> Self { let tpu_addr = *bind_addr; let gossip_addr = Self::next_port(&bind_addr, 1); let tvu_addr = Self::next_port(&bind_addr, 2); diff --git a/core/src/erasure.rs b/core/src/erasure.rs index 7e1e3cc0e9..cf049d7c96 100644 --- a/core/src/erasure.rs +++ b/core/src/erasure.rs @@ -67,12 +67,12 @@ fn get_matrix(m: i32, k: i32, w: i32) -> Vec { matrix } -pub const ERASURE_W: i32 = 32; +const ERASURE_W: i32 = 32; // Generate coding blocks into coding // There are some alignment restrictions, blocks should be aligned by 16 bytes // which means their size should be >= 16 bytes -pub fn generate_coding_blocks(coding: &mut [&mut [u8]], data: &[&[u8]]) -> Result<()> { +fn generate_coding_blocks(coding: &mut [&mut [u8]], data: &[&[u8]]) -> Result<()> { if data.is_empty() { return Ok(()); } @@ -123,11 +123,7 @@ pub fn generate_coding_blocks(coding: &mut [&mut [u8]], data: &[&[u8]]) -> Resul // data: array of blocks to recover into // coding: arry of coding blocks // erasures: list of indices in data where blocks should be recovered -pub fn decode_blocks( - data: &mut [&mut [u8]], - coding: &mut [&mut [u8]], - erasures: &[i32], -) -> Result<()> { +fn decode_blocks(data: &mut [&mut [u8]], coding: &mut [&mut [u8]], erasures: &[i32]) -> Result<()> { if data.is_empty() { return Ok(()); }