From b8d5a1fad1dcba5a49008fb3d65142fae76b9e43 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 6 Feb 2023 03:06:01 -0500 Subject: [PATCH] hashing refactor --- crates/lib/hashing/src/sha256/sha256_hash_string.rs | 10 +++++----- .../src/job_steps/process_single_job.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/lib/hashing/src/sha256/sha256_hash_string.rs b/crates/lib/hashing/src/sha256/sha256_hash_string.rs index ae9d55e5d2..80143c5386 100644 --- a/crates/lib/hashing/src/sha256/sha256_hash_string.rs +++ b/crates/lib/hashing/src/sha256/sha256_hash_string.rs @@ -2,7 +2,7 @@ use crate::sha256::sha256_digest_buffer::sha256_digest_buffer; use data_encoding::HEXLOWER_PERMISSIVE; use errors::AnyhowResult; -pub fn hash_string_sha256(string_input: &str) -> AnyhowResult { +pub fn sha256_hash_string(string_input: &str) -> AnyhowResult { let digest = sha256_digest_buffer(string_input.as_bytes())?; let hash = HEXLOWER_PERMISSIVE.encode(digest.as_ref()); Ok(hash) @@ -10,14 +10,14 @@ pub fn hash_string_sha256(string_input: &str) -> AnyhowResult { #[cfg(test)] mod tests { - use crate::sha256::sha256_hash_string::hash_string_sha256; + use crate::sha256::sha256_hash_string::sha256_hash_string; #[test] - fn test_hash_string_sha256() { - assert_eq!(hash_string_sha256("test").unwrap(), + fn test_sha256_hash_string() { + assert_eq!(sha256_hash_string("test").unwrap(), "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"); - assert_eq!(hash_string_sha256("foo").unwrap(), + assert_eq!(sha256_hash_string("foo").unwrap(), "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"); } } \ No newline at end of file diff --git a/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs b/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs index 6df21d6118..0f89ded89f 100644 --- a/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs +++ b/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs @@ -8,17 +8,18 @@ use container_common::anyhow_result::AnyhowResult; use container_common::filesystem::check_file_exists::check_file_exists; use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; -use container_common::hashing::hash_string_sha2::hash_string_sha2; use container_common::token::random_uuid::generate_random_uuid; use crate::job_steps::download_file_from_bucket::maybe_download_file_from_bucket; use crate::job_steps::job_args::JobArgs; use crate::job_steps::process_single_job_error::ProcessSingleJobError; +use crate::job_steps::seconds_to_decoder_steps::seconds_to_decoder_steps; use database_queries::column_types::vocoder_type::VocoderType; use database_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_done::mark_tts_inference_job_done; use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_pending_and_grab_lock::mark_tts_inference_job_pending_and_grab_lock; use database_queries::queries::tts::tts_models::get_tts_model_for_inference::TtsModelForInferenceRecord; use database_queries::queries::tts::tts_results::insert_tts_result::insert_tts_result; +use hashing::sha256::sha256_hash_string::sha256_hash_string; use log::{warn, info, error}; use newrelic_telemetry::Span; use std::fs::File; @@ -29,7 +30,6 @@ use tempdir::TempDir; use tts_common::clean_symbols::clean_symbols; use tts_common::text_pipelines::guess_pipeline::guess_text_pipeline_heuristic; use tts_common::text_pipelines::text_pipeline_type::TextPipelineType; -use crate::job_steps::seconds_to_decoder_steps::seconds_to_decoder_steps; #[derive(Deserialize, Default)] struct FileMetadata { @@ -364,7 +364,7 @@ pub async fn process_single_job( // ==================== SAVE RECORDS ==================== // - let text_hash = hash_string_sha2(&cleaned_inference_text) + let text_hash = sha256_hash_string(&cleaned_inference_text) .map_err(|e| ProcessSingleJobError::Other(e))?; let worker_name = job_args.get_worker_name();