Fix two storage tests
* test_encrypt_files_many_keys_multiple_keys passing - buffer chunk size unified between single key and multiple key path, which shouldn't be necessary but can fix later. * test_encrypt_file_many_keys_bad_key_length passing
This commit is contained in:
parent
4b3d64ec9f
commit
09296e0d71
|
@ -41,8 +41,8 @@ pub fn chacha_cbc_encrypt_ledger(
|
|||
) -> io::Result<()> {
|
||||
let mut out_file =
|
||||
BufWriter::new(File::create(out_path).expect("Can't open ledger encrypted data file"));
|
||||
let mut buffer = [0; 4 * 1024];
|
||||
let mut encrypted_buffer = [0; 4 * 1024];
|
||||
let mut buffer = [0; 8 * 1024];
|
||||
let mut encrypted_buffer = [0; 8 * 1024];
|
||||
let key = [0; CHACHA_KEY_SIZE];
|
||||
let mut total_entries = 0;
|
||||
let mut entry = slice;
|
||||
|
@ -55,6 +55,10 @@ pub fn chacha_cbc_encrypt_ledger(
|
|||
DEFAULT_SLOT_HEIGHT,
|
||||
) {
|
||||
Ok((num_entries, entry_len)) => {
|
||||
debug!(
|
||||
"chacha: encrypting slice: {} num_entries: {} entry_len: {}",
|
||||
slice, num_entries, entry_len
|
||||
);
|
||||
debug!("read {} bytes", entry_len);
|
||||
let size = entry_len as usize;
|
||||
if size == 0 {
|
||||
|
@ -152,7 +156,7 @@ mod tests {
|
|||
assert_eq!(
|
||||
hasher.result(),
|
||||
Hash::new(&hex!(
|
||||
"58433c941060af56b72bfeaca161f19ed6df531efb28961dc6b83f53fbf66ffe"
|
||||
"1ef70b5491a5f2b05ebeb0f92a03c131a7a78622f3643064d6d3c52a0c083175"
|
||||
)),
|
||||
);
|
||||
remove_file(out_path).unwrap();
|
||||
|
|
|
@ -51,8 +51,8 @@ pub fn chacha_cbc_encrypt_file_many_keys(
|
|||
DEFAULT_SLOT_HEIGHT,
|
||||
) {
|
||||
Ok((num_entries, entry_len)) => {
|
||||
info!(
|
||||
"encrypting slice: {} num_entries: {} entry_len: {}",
|
||||
debug!(
|
||||
"chacha_cuda: encrypting slice: {} num_entries: {} entry_len: {}",
|
||||
slice, num_entries, entry_len
|
||||
);
|
||||
let entry_len_usz = entry_len as usize;
|
||||
|
@ -155,7 +155,6 @@ mod tests {
|
|||
}
|
||||
|
||||
#[test]
|
||||
#[ignore]
|
||||
fn test_encrypt_file_many_keys_multiple_keys() {
|
||||
solana_logger::setup();
|
||||
|
||||
|
@ -203,14 +202,13 @@ mod tests {
|
|||
let _ignored = remove_file(out_path);
|
||||
}
|
||||
|
||||
/*
|
||||
#[test]
|
||||
fn test_encrypt_file_many_keys_bad_key_length() {
|
||||
let mut keys = hex!("abc123");
|
||||
let ledger_dir = "test_encrypt_file_many_keys_bad_key_length";
|
||||
let ledger_path = get_tmp_ledger_path(ledger_dir);
|
||||
let samples = [0];
|
||||
assert!(chacha_cbc_encrypt_file_many_keys(&ledger_path, 0, &mut keys, &samples,).is_err());
|
||||
let db_ledger = Arc::new(DbLedger::open(&ledger_path).unwrap());
|
||||
assert!(chacha_cbc_encrypt_file_many_keys(&db_ledger, 0, &mut keys, &samples,).is_err());
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue