zec
/
zcash-android-wallet-sdk
mirror of https://github.com/zcash/zcash-android-wallet-sdk.git

Restore build to working order by removing local-only changes 

which supported scanning in batches for better visibility into scan
progress. Also updated Cargo files to support error-free build for the
beta release.
This commit is contained in:
Kevin Gorham 2020-01-15 09:14:27 -05:00
parent a0de0b907f
commit 77f6e77e14
No known key found for this signature in database
GPG Key ID: CCA55602DF49FC38
3 changed files with 529 additions and 742 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1263
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
Cargo.toml
View File

@ -42,7 +42,7 @@ rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
[dependencies.zcash_proofs] [dependencies.zcash_proofs]
git = "https://github.com/str4d/librustzcash.git" git = "https://github.com/str4d/librustzcash.git"
rev = "1cbeac9d593d65938870797fb8dbafa352644d34" rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
[features] [features]
mainnet = ["zcash_client_sqlite/mainnet"] mainnet = ["zcash_client_sqlite/mainnet"]

6
src/main/rust/lib.rs
View File

@ -31,8 +31,7 @@ use zcash_client_sqlite::{
get_verified_balance, get_verified_balance,
}, },
scan::{ scan::{
scan_cached_blocks, scan_cached_blocks
scan_cached_block_batch
}, },
transact::create_to_address, transact::create_to_address,
}; };
@ -503,7 +502,8 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_RustBackend_scanBlockBatch(
let db_cache = utils::java_string_to_rust(&env, db_cache); let db_cache = utils::java_string_to_rust(&env, db_cache);
let db_data = utils::java_string_to_rust(&env, db_data); let db_data = utils::java_string_to_rust(&env, db_data);
match scan_cached_block_batch(&db_cache, &db_data, limit) { // match scan_cached_block_batch(&db_cache, &db_data, limit) {
match scan_cached_blocks(&db_cache, &db_data) {
Ok(()) => Ok(JNI_TRUE), Ok(()) => Ok(JNI_TRUE),
Err(e) => Err(format_err!("Error while scanning blocks: {}", e)), Err(e) => Err(format_err!("Error while scanning blocks: {}", e)),
} }