Rename slice to segment to match book terminology

This commit is contained in:
Stephen Akridge 2019-01-17 09:25:23 -08:00 committed by sakridge
parent 9c8e853567
commit b296a9a0c7
1 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,6 @@
// Module used by validators to approve storage mining proofs
// // in parallel using the GPU
use crate::chacha::{CHACHA_BLOCK_SIZE, CHACHA_KEY_SIZE};
use crate::db_ledger::{DbLedger, DEFAULT_SLOT_HEIGHT};
use crate::sigverify::{
@ -16,7 +19,7 @@ use crate::storage_stage::ENTRIES_PER_SEGMENT;
// and return the vec of sha states
pub fn chacha_cbc_encrypt_file_many_keys(
db_ledger: &Arc<DbLedger>,
slice: u64,
segment: u64,
ivecs: &mut [u8],
samples: &[u64],
) -> io::Result<Vec<Hash>> {
@ -36,7 +39,7 @@ pub fn chacha_cbc_encrypt_file_many_keys(
let mut sha_states = vec![0; num_keys * size_of::<Hash>()];
let mut int_sha_states = vec![0; num_keys * 112];
let keys: Vec<u8> = vec![0; num_keys * CHACHA_KEY_SIZE]; // keys not used ATM, uniqueness comes from IV
let mut entry = slice;
let mut entry = segment;
let mut total_entries = 0;
let mut total_entry_len = 0;
let mut time: f32 = 0.0;
@ -52,8 +55,8 @@ pub fn chacha_cbc_encrypt_file_many_keys(
) {
Ok((num_entries, entry_len)) => {
debug!(
"chacha_cuda: encrypting slice: {} num_entries: {} entry_len: {}",
slice, num_entries, entry_len
"chacha_cuda: encrypting segment: {} num_entries: {} entry_len: {}",
segment, num_entries, entry_len
);
let entry_len_usz = entry_len as usize;
unsafe {
@ -75,10 +78,10 @@ pub fn chacha_cbc_encrypt_file_many_keys(
total_entries += num_entries;
entry += num_entries;
debug!(
"total entries: {} entry: {} slice: {} entries_per_slice: {}",
total_entries, entry, slice, ENTRIES_PER_SEGMENT
"total entries: {} entry: {} segment: {} entries_per_segment: {}",
total_entries, entry, segment, ENTRIES_PER_SEGMENT
);
if (entry - slice) >= ENTRIES_PER_SEGMENT {
if (entry - segment) >= ENTRIES_PER_SEGMENT {
break;
}
}