zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1542 from zcash/fix_bad_wallettest_import 

zcash_client_sqlite: Fix bad `WalletTest` import that breaks downstream builds.
This commit is contained in:
Jack Grigg 2024-09-21 00:12:07 +01:00 committed by GitHub
parent 8b5236a45a 176c0cb805
commit c0f4effdb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -438,12 +438,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "base64"
version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.22.1" version = "0.22.1"
@ -3566,7 +3560,7 @@ version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
dependencies = [ dependencies = [
"base64 0.22.1", "base64",
"rustls-pki-types", "rustls-pki-types",
] ]
@ -3837,7 +3831,7 @@ version = "3.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
dependencies = [ dependencies = [
"base64 0.22.1", "base64",
"chrono", "chrono",
"hex", "hex",
"indexmap 1.9.3", "indexmap 1.9.3",
@ -4433,7 +4427,7 @@ dependencies = [
"async-stream", "async-stream",
"async-trait", "async-trait",
"axum", "axum",
"base64 0.22.1", "base64",
"bytes", "bytes",
"flate2", "flate2",
"h2", "h2",
@ -5833,7 +5827,7 @@ dependencies = [
"arti-client", "arti-client",
"assert_matches", "assert_matches",
"async-trait", "async-trait",
"base64 0.21.7", "base64",
"bech32", "bech32",
"bip32", "bip32",
"bls12_381", "bls12_381",
@ -6156,7 +6150,7 @@ dependencies = [
name = "zip321" name = "zip321"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"base64 0.21.7", "base64",
"nom", "nom",
"percent-encoding", "percent-encoding",
"proptest", "proptest",

2
Cargo.toml
View File

@ -84,7 +84,7 @@ sha2 = "0.10"
document-features = "0.2" document-features = "0.2"
# Encodings # Encodings
base64 = "0.21" base64 = "0.22"
bech32 = "0.9" bech32 = "0.9"
bs58 = { version = "0.5", features = ["check"] } bs58 = { version = "0.5", features = ["check"] }
byteorder = "1" byteorder = "1"

4
zcash_client_sqlite/src/lib.rs
View File

@ -53,7 +53,7 @@ use zcash_client_backend::{
Account, AccountBirthday, AccountPurpose, AccountSource, BlockMetadata, Account, AccountBirthday, AccountPurpose, AccountSource, BlockMetadata,
DecryptedTransaction, InputSource, NullifierQuery, ScannedBlock, SeedRelevance, DecryptedTransaction, InputSource, NullifierQuery, ScannedBlock, SeedRelevance,
SentTransaction, SpendableNotes, TransactionDataRequest, WalletCommitmentTrees, WalletRead, SentTransaction, SpendableNotes, TransactionDataRequest, WalletCommitmentTrees, WalletRead,
WalletSummary, WalletTest, WalletWrite, SAPLING_SHARD_HEIGHT, WalletSummary, WalletWrite, SAPLING_SHARD_HEIGHT,
}, },
keys::{ keys::{
AddressGenerationError, UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedSpendingKey, AddressGenerationError, UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedSpendingKey,
@ -99,7 +99,7 @@ use maybe_rayon::{
}; };
#[cfg(any(test, feature = "test-dependencies"))] #[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. /// `maybe-rayon` doesn't provide this as a fallback, so we have to.
#[cfg(not(feature = "multicore"))] #[cfg(not(feature = "multicore"))]