macro: Remove dependency on solana-program (#5375)

* macro: Remove dependency on solana-program * Bump version and fix clippy
solana-labs · Sep 27, 2023 · 7266486 · 7266486
1 parent 51a6fdf
commit 7266486
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libraries/discriminator/derive/Cargo.toml b/libraries/discriminator/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spl-discriminator-derive"
-version = "0.1.0"
+version = "0.1.1"
 description = "Derive macro library for the `spl-discriminator` library"
 authors = ["Solana Labs Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -16,4 +16,4 @@ syn = { version = "2.0", features = ["full"] }
 proc-macro = true
 
 [package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/libraries/discriminator/syn/Cargo.toml b/libraries/discriminator/syn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spl-discriminator-syn"
-version = "0.1.0"
+version = "0.1.1"
 description = "Token parsing and generating library for the `spl-discriminator` library"
 authors = ["Solana Labs Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -10,12 +10,12 @@ edition = "2021"
 [dependencies]
 proc-macro2 = "1.0"
 quote = "1.0"
-solana-program = "1.16.13"
+sha2 = "0.10"
 syn = { version = "2.0", features = ["full"] }
 thiserror = "1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/libraries/discriminator/syn/src/lib.rs b/libraries/discriminator/syn/src/lib.rs
@@ -10,7 +10,7 @@ use {
     crate::{error::SplDiscriminateError, parser::parse_hash_input},
     proc_macro2::{Span, TokenStream},
     quote::{quote, ToTokens},
-    solana_program::hash,
+    sha2::{Digest, Sha256},
     syn::{parse::Parse, Generics, Ident, Item, ItemEnum, ItemStruct, LitByteStr, WhereClause},
 };
 
@@ -102,7 +102,7 @@ impl From<&SplDiscriminateBuilder> for TokenStream {
 /// Returns the bytes for the TLV hash_input discriminator
 fn get_discriminator_bytes(hash_input: &str) -> LitByteStr {
     LitByteStr::new(
-        &hash::hashv(&[hash_input.as_bytes()]).to_bytes()[..8],
+        &Sha256::digest(hash_input.as_bytes())[..8],
         Span::call_site(),
     )
 }
diff --git a/libraries/program-error/derive/Cargo.toml b/libraries/program-error/derive/Cargo.toml
@@ -13,5 +13,5 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0"
 quote = "1.0"
-solana-program = "1.16.13"
+sha2 = "0.10"
 syn = { version = "2.0", features = ["full"] }
diff --git a/libraries/program-error/derive/src/macro_impl.rs b/libraries/program-error/derive/src/macro_impl.rs
@@ -4,6 +4,7 @@ use {
     crate::parser::SplProgramErrorArgs,
     proc_macro2::Span,
     quote::quote,
+    sha2::{Digest, Sha256},
     syn::{
         punctuated::Punctuated, token::Comma, Expr, ExprLit, Ident, ItemEnum, Lit, LitInt, LitStr,
         Token, Variant,
@@ -184,9 +185,10 @@ fn u32_from_hash(enum_ident: &Ident) -> u32 {
     // `SPL_ERROR_HASH_MIN_VALUE`!
     let mut nonce: u32 = 0;
     loop {
-        let hash = solana_program::hash::hashv(&[hash_input.as_bytes(), &nonce.to_le_bytes()]);
+        let mut hasher = Sha256::new_with_prefix(hash_input.as_bytes());
+        hasher.update(nonce.to_le_bytes());
         let d = u32::from_le_bytes(
-            hash.to_bytes()[13..17]
+            hasher.finalize()[13..17]
                 .try_into()
                 .expect("Unable to convert hash to u32"),
         );