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:
parent
a0de0b907f
commit
77f6e77e14
File diff suppressed because it is too large
Load Diff
|
@ -42,7 +42,7 @@ rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
|
|||
|
||||
[dependencies.zcash_proofs]
|
||||
git = "https://github.com/str4d/librustzcash.git"
|
||||
rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
|
||||
rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
|
||||
|
||||
[features]
|
||||
mainnet = ["zcash_client_sqlite/mainnet"]
|
||||
|
|
|
@ -31,8 +31,7 @@ use zcash_client_sqlite::{
|
|||
get_verified_balance,
|
||||
},
|
||||
scan::{
|
||||
scan_cached_blocks,
|
||||
scan_cached_block_batch
|
||||
scan_cached_blocks
|
||||
},
|
||||
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_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),
|
||||
Err(e) => Err(format_err!("Error while scanning blocks: {}", e)),
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue