blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

frozen-abi-macro: use `log` from `solana_frozen_abi` (#153) 

* frozen-abi-macro: use `log` from `solana_frozen_abi`

* use private module approach
This commit is contained in:
Joe C 2024-03-23 07:38:57 -05:00 committed by GitHub
parent 5cfb6e860d
commit bfdfc6cef2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frozen-abi/macro/src/lib.rs
View File

@ -146,7 +146,7 @@ fn derive_abi_sample_enum_type(input: ItemEnum) -> TokenStream {
#( #attrs )*
impl #impl_generics ::solana_frozen_abi::abi_example::AbiExample for #type_name #ty_generics #where_clause {
fn example() -> Self {
::log::info!(
::solana_frozen_abi::__private::log::info!(
"AbiExample for enum: {}",
std::any::type_name::<#type_name #ty_generics>()
);
@ -198,7 +198,7 @@ fn derive_abi_sample_struct_type(input: ItemStruct) -> TokenStream {
#( #attrs )*
impl #impl_generics ::solana_frozen_abi::abi_example::AbiExample for #type_name #ty_generics #where_clause {
fn example() -> Self {
::log::info!(
::solana_frozen_abi::__private::log::info!(
"AbiExample for struct: {}",
std::any::type_name::<#type_name #ty_generics>()
);
@ -300,7 +300,7 @@ fn quote_for_test(
let mut hash = digester.finalize();
// pretty-print error
if result.is_err() {
::log::error!("digest error: {:#?}", result);
::solana_frozen_abi::__private::log::error!("digest error: {:#?}", result);
}
result.unwrap();
let actual_digest = format!("{}", hash);
@ -308,7 +308,7 @@ fn quote_for_test(
if #expected_digest != actual_digest {
#p!("sed -i -e 's/{}/{}/g' $(git grep --files-with-matches frozen_abi)", #expected_digest, hash);
}
::log::warn!("Not testing the abi digest under SOLANA_ABI_BULK_UPDATE!");
::solana_frozen_abi::__private::log::warn!("Not testing the abi digest under SOLANA_ABI_BULK_UPDATE!");
} else {
if let Ok(dir) = ::std::env::var("SOLANA_ABI_DUMP_DIR") {
assert_eq!(#expected_digest, actual_digest, "Possibly ABI changed? Examine the diff in SOLANA_ABI_DUMP_DIR!: \n$ diff -u {}/*{}* {}/*{}*", dir, #expected_digest, dir, actual_digest);

7
frozen-abi/src/lib.rs
View File

@ -19,3 +19,10 @@ extern crate solana_frozen_abi_macro;
#[cfg(test)]
#[macro_use]
extern crate serde_derive;
// Not public API. Referenced by macro-generated code.
#[doc(hidden)]
pub mod __private {
#[doc(hidden)]
pub use log;
}