Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix importing contract crates into other crates for testing #1364

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Fix importing contract crates into other crates for testing #1364

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
794d4ff
Fix importing contract crates into other crates for testing
leighmcculloch Oct 8, 2024
9634810
fix
leighmcculloch Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions soroban-sdk-macros/src/derive_fn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,24 @@ pub fn derive_pub_fn(
return Err(quote! { #(#compile_errors)* });
}

let testutils_only_code = if cfg!(feature = "testutils") {
Some(quote! {
#[deprecated(note = #deprecated_note)]
pub fn invoke_raw_slice(
env: #crate_path::Env,
args: &[#crate_path::Val],
) -> #crate_path::Val {
if args.len() != #arg_count {
panic!("invalid number of input arguments: {} expected, got {}", #arg_count, args.len());
}
#[allow(deprecated)]
invoke_raw(env, #(#slice_args),*)
}
})
} else {
None
};

// Generated code.
Ok(quote! {
#[doc(hidden)]
Expand All @@ -146,18 +164,7 @@ pub fn derive_pub_fn(
)
}

#[cfg(any(test, feature = "testutils"))]
#[deprecated(note = #deprecated_note)]
pub fn invoke_raw_slice(
env: #crate_path::Env,
args: &[#crate_path::Val],
) -> #crate_path::Val {
if args.len() != #arg_count {
panic!("invalid number of input arguments: {} expected, got {}", #arg_count, args.len());
}
#[allow(deprecated)]
invoke_raw(env, #(#slice_args),*)
}
#testutils_only_code

#[deprecated(note = #deprecated_note)]
#[cfg_attr(target_family = "wasm", export_name = #wrap_export_name)]
Expand All @@ -178,6 +185,10 @@ pub fn derive_contract_function_registration_ctor<'a>(
trait_ident: Option<&Ident>,
methods: impl Iterator<Item = &'a syn::ImplItemFn>,
) -> TokenStream2 {
if cfg!(not(feature = "testutils")) {
return quote!();
}

let (idents, wrap_idents): (Vec<_>, Vec<_>) = methods
.map(|m| {
let ident = format!("{}", m.sig.ident);
Expand All @@ -193,7 +204,6 @@ pub fn derive_contract_function_registration_ctor<'a>(

quote! {
#[doc(hidden)]
#[cfg(any(test, feature = "testutils"))]
#[#crate_path::reexports_for_macros::ctor::ctor]
#[allow(non_snake_case)]
fn #ctor_ident() {
Expand Down
Loading