Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ mod proved;
#[cfg(all(
test,
feature = "state-transition-signing",
feature = "core_key_wallet"
feature = "core_key_wallet",
feature = "shielded-client"
))]
mod signing_tests;
mod state_transition_estimated_fee_validation;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,15 @@
//! in `state_transition::mod` pins `sign_with_core_signer` against
//! `sign_by_private_key` — we don't re-derive that contract here.

// `crate::shielded::builder` (the high-level bundle builder these tests drive) only
// exists under `shielded-client`, so this module must require it too — otherwise the
// `--all-targets` feature-unified lib-test target (which enables `state-transition-signing`
// + `core_key_wallet` without `shielded-client`) fails to resolve the builder import.
#![cfg(all(
test,
feature = "state-transition-signing",
feature = "core_key_wallet"
feature = "core_key_wallet",
feature = "shielded-client"
))]

use crate::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof;
Expand Down
13 changes: 6 additions & 7 deletions packages/rs-platform-wallet-ffi/src/persistence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1430,10 +1430,10 @@ impl PlatformWalletPersistence for FFIPersister {
.on_load_shielded_outgoing_notes_free_fn
.is_some()
{
return Err("on_load_shielded_outgoing_notes_fn and \
on_load_shielded_outgoing_notes_free_fn must be provided together"
.to_string()
.into());
return Err(PersistenceError::backend(
"on_load_shielded_outgoing_notes_fn and \
on_load_shielded_outgoing_notes_free_fn must be provided together",
));
}

// 1) notes
Expand Down Expand Up @@ -1508,11 +1508,10 @@ impl PlatformWalletPersistence for FFIPersister {
let rc =
unsafe { load_outgoing(self.callbacks.context, &mut out_ptr, &mut out_count) };
if rc != 0 {
return Err(format!(
return Err(PersistenceError::backend(format!(
"on_load_shielded_outgoing_notes_fn returned error code {}",
rc
)
.into());
)));
}
struct OutgoingGuard {
context: *mut c_void,
Expand Down
Loading