Skip to content

Commit

Permalink
Merge pull request #1542 from zcash/fix_bad_wallettest_import
Browse files Browse the repository at this point in the history
zcash_client_sqlite: Fix bad `WalletTest` import that breaks downstream builds.
  • Loading branch information
str4d authored Sep 20, 2024
2 parents 8b5236a + 176c0cb commit c0f4eff
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 14 deletions.
16 changes: 5 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ sha2 = "0.10"
document-features = "0.2"

# Encodings
base64 = "0.21"
base64 = "0.22"
bech32 = "0.9"
bs58 = { version = "0.5", features = ["check"] }
byteorder = "1"
Expand Down
4 changes: 2 additions & 2 deletions zcash_client_sqlite/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ use zcash_client_backend::{
Account, AccountBirthday, AccountPurpose, AccountSource, BlockMetadata,
DecryptedTransaction, InputSource, NullifierQuery, ScannedBlock, SeedRelevance,
SentTransaction, SpendableNotes, TransactionDataRequest, WalletCommitmentTrees, WalletRead,
WalletSummary, WalletTest, WalletWrite, SAPLING_SHARD_HEIGHT,
WalletSummary, WalletWrite, SAPLING_SHARD_HEIGHT,
},
keys::{
AddressGenerationError, UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedSpendingKey,
Expand Down Expand Up @@ -99,7 +99,7 @@ use maybe_rayon::{
};

#[cfg(any(test, feature = "test-dependencies"))]
use zcash_client_backend::data_api::testing::TransactionSummary;
use zcash_client_backend::data_api::{testing::TransactionSummary, WalletTest};

/// `maybe-rayon` doesn't provide this as a fallback, so we have to.
#[cfg(not(feature = "multicore"))]
Expand Down

0 comments on commit c0f4eff

Please sign in to comment.