From 0dc709ed5a53c723f47fa1d10063e57bb50a63c8 Mon Sep 17 00:00:00 2001
From: Shadaj Laddad <shadaj@users.noreply.github.com>
Date: Mon, 2 Dec 2024 12:44:19 -0800
Subject: [PATCH] chore(stageleft): use same hashing library everywhere (#1590)

---
 Cargo.lock                            | 23 ++---------------------
 hydroflow_plus/src/deploy/trybuild.rs |  4 +---
 stageleft_macro/Cargo.toml            |  2 +-
 stageleft_macro/src/lib.rs            |  4 +++-
 stageleft_tool/Cargo.toml             |  2 +-
 stageleft_tool/src/lib.rs             |  5 +++--
 6 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 17b2e0470e4..396a800a5c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1325,12 +1325,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "home"
 version = "0.5.9"
@@ -3227,19 +3221,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sha256"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18278f6a914fa3070aa316493f7d2ddfb9ac86ebc06fa3b83bffda487e9065b0"
-dependencies = [
- "async-trait",
- "bytes",
- "hex",
- "sha2",
- "tokio",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -3364,7 +3345,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "sha256",
+ "sha2",
  "syn 2.0.75",
 ]
 
@@ -3391,7 +3372,7 @@ version = "0.4.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "sha256",
+ "sha2",
  "syn 2.0.75",
  "syn-inline-mod",
 ]
diff --git a/hydroflow_plus/src/deploy/trybuild.rs b/hydroflow_plus/src/deploy/trybuild.rs
index 1d075b1205a..7922e342b91 100644
--- a/hydroflow_plus/src/deploy/trybuild.rs
+++ b/hydroflow_plus/src/deploy/trybuild.rs
@@ -73,9 +73,7 @@ pub fn create_graph_trybuild(
         }
     });
 
-    let mut hasher = Sha256::new();
-    hasher.update(&source);
-    let hash = format!("{:X}", hasher.finalize())
+    let hash = format!("{:X}", Sha256::digest(&source))
         .chars()
         .take(8)
         .collect::<String>();
diff --git a/stageleft_macro/Cargo.toml b/stageleft_macro/Cargo.toml
index 8ef2802afba..b9f1b3fba3f 100644
--- a/stageleft_macro/Cargo.toml
+++ b/stageleft_macro/Cargo.toml
@@ -19,7 +19,7 @@ quote = "1.0.35"
 syn = { version = "2.0.46", features = [ "parsing", "extra-traits", "visit" ] }
 proc-macro2 = "1.0.74"
 proc-macro-crate = "1.0.0"
-sha256 = "1.0.0"
+sha2 = "0.10.0"
 
 [dev-dependencies]
 insta = "1.39"
diff --git a/stageleft_macro/src/lib.rs b/stageleft_macro/src/lib.rs
index 279a53a88c7..b36241554b9 100644
--- a/stageleft_macro/src/lib.rs
+++ b/stageleft_macro/src/lib.rs
@@ -1,5 +1,6 @@
 use proc_macro2::{Punct, Spacing, Span, TokenStream};
 use quote::{quote, quote_spanned, ToTokens};
+use sha2::{Digest, Sha256};
 use syn::punctuated::Punctuated;
 use syn::spanned::Spanned;
 use syn::{AngleBracketedGenericArguments, Token, Type};
@@ -339,7 +340,7 @@ pub fn entry(
         .chars()
         .filter(|c| c.is_alphanumeric())
         .collect::<String>();
-    let input_hash = "macro_".to_string() + &sha256::digest(input_contents);
+    let input_hash = "macro_".to_string() + &format!("{:X}", Sha256::digest(input_contents));
     let input_hash_ident = syn::Ident::new(&input_hash, Span::call_site());
     let input_hash_impl_ident = syn::Ident::new(&(input_hash + "_impl"), Span::call_site());
 
@@ -353,6 +354,7 @@ pub fn entry(
 
         #[cfg_attr(not(stageleft_macro), allow(unused))]
         #[cfg_attr(not(stageleft_macro), doc(hidden))]
+        #[allow(non_snake_case)]
         pub(crate) fn #input_hash_impl_ident(input: #root::internal::TokenStream) -> #root::internal::TokenStream {
             let input_parsed = #root::internal::syn::parse::Parser::parse(
                 #root::internal::syn::punctuated::Punctuated::<#root::internal::syn::Expr, #root::internal::syn::Token![,]>::parse_terminated,
diff --git a/stageleft_tool/Cargo.toml b/stageleft_tool/Cargo.toml
index d8250cb5c3f..cca49aa24ca 100644
--- a/stageleft_tool/Cargo.toml
+++ b/stageleft_tool/Cargo.toml
@@ -18,4 +18,4 @@ syn-inline-mod = "0.6.0"
 quote = "1.0.35"
 syn = { version = "2.0.46", features = [ "parsing", "extra-traits", "visit" ] }
 proc-macro2 = "1.0.74"
-sha256 = "1.0.0"
+sha2 = "0.10.0"
diff --git a/stageleft_tool/src/lib.rs b/stageleft_tool/src/lib.rs
index 6cc232eeb6b..2af956a2e93 100644
--- a/stageleft_tool/src/lib.rs
+++ b/stageleft_tool/src/lib.rs
@@ -4,6 +4,7 @@ use std::{env, fs};
 
 use proc_macro2::Span;
 use quote::ToTokens;
+use sha2::{Digest, Sha256};
 use syn::visit::Visit;
 use syn::visit_mut::VisitMut;
 use syn::{parse_quote, UsePath};
@@ -41,7 +42,7 @@ impl<'a> Visit<'a> for GenMacroVistor {
                 .chars()
                 .filter(|c| c.is_alphanumeric())
                 .collect::<String>();
-            let contents_hash = sha256::digest(contents);
+            let contents_hash = format!("{:X}", Sha256::digest(contents));
             self.exported_macros
                 .insert((contents_hash, cur_path.to_token_stream().to_string()));
         }
@@ -72,7 +73,7 @@ pub fn gen_macro(staged_path: &Path, crate_name: &str) {
 
         let proc_macro_wrapper: syn::ItemFn = parse_quote!(
             #[proc_macro]
-            #[expect(unused_qualifications, reason = "generated code")]
+            #[expect(unused_qualifications, non_snake_case, reason = "generated code")]
             pub fn #underscored_path(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStream {
                 let input = ::stageleft::internal::TokenStream::from(input);
                 let out = #exported_from_parsed::#underscored_path_impl(input);