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

Fix pre-existing typos in error messages 

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Carter Jernigan 2022-08-04 13:17:25 -04:00 committed by Jack Grigg
parent 67f0b156ec
commit 8c8fd57b21
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdk-lib/src/main/rust/lib.rs
View File

@ -255,7 +255,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_tool_DerivationTool_deriveU
let account_index = if account_index >= 0 { let account_index = if account_index >= 0 {
account_index as u32 account_index as u32
} else { } else {
return Err(format_err!("accountIndex argument must be positive")); return Err(format_err!("accountIndex argument must be nonnegative"));
}; };
let account_id = AccountId::from(account_index); let account_id = AccountId::from(account_index);
@ -540,7 +540,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getVerified
.iter() .iter()
.map(|utxo| utxo.txout.value) .map(|utxo| utxo.txout.value)
.sum::<Option<Amount>>() .sum::<Option<Amount>>()
.ok_or_else(|| format_err!("Balance overflowed MAX_MONEY. Lucky you!"))?; .ok_or_else(|| format_err!("Balance overflowed MAX_MONEY."))?;
Ok(amount.into()) Ok(amount.into())
}); });
@ -578,7 +578,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getTotalTra
.iter() .iter()
.map(|utxo| utxo.txout.value) .map(|utxo| utxo.txout.value)
.sum::<Option<Amount>>() .sum::<Option<Amount>>()
.ok_or_else(|| format_err!("Balance overflowed MAX_MONEY. Lucky you!"))?; .ok_or_else(|| format_err!("Balance overflowed MAX_MONEY"))?;
Ok(amount.into()) Ok(amount.into())
}); });
@ -904,7 +904,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_tool_DerivationTool_deriveT
let account = if account >= 0 { let account = if account >= 0 {
AccountId::from(account as u32) AccountId::from(account as u32)
} else { } else {
return Err(format_err!("account argument must be positive")); return Err(format_err!("account argument must be nonnegative"));
}; };
// Derive the USK to ensure it exists, and fetch its transparent component. // Derive the USK to ensure it exists, and fetch its transparent component.
let usk = UnifiedSpendingKey::from_seed(&network, &seed, account) let usk = UnifiedSpendingKey::from_seed(&network, &seed, account)
@ -944,12 +944,12 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_tool_DerivationTool_deriveT
let account = if account >= 0 { let account = if account >= 0 {
account as u32 account as u32
} else { } else {
return Err(format_err!("account argument must be positive")); return Err(format_err!("account argument must be nonnegative"));
}; };
let index = if index >= 0 { let index = if index >= 0 {
index as u32 index as u32
} else { } else {
return Err(format_err!("index argument must be positive")); return Err(format_err!("index argument must be nonnegative"));
}; };
let tfvk = UnifiedSpendingKey::from_seed(&network, &seed, AccountId::from(account)) let tfvk = UnifiedSpendingKey::from_seed(&network, &seed, AccountId::from(account))
.map_err(|e| format_err!("error generating unified spending key from seed: {:?}", e)) .map_err(|e| format_err!("error generating unified spending key from seed: {:?}", e))
@ -981,7 +981,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_tool_DerivationTool_deriveT
let index = if index >= 0 { let index = if index >= 0 {
index as u32 index as u32
} else { } else {
return Err(format_err!("index argument must be positive")); return Err(format_err!("index argument must be nonnegative"));
}; };
let xprv_str = utils::java_string_to_rust(&env, secret_key); let xprv_str = utils::java_string_to_rust(&env, secret_key);
let xprv = match hdwallet_bitcoin::PrivKey::deserialize(xprv_str) { let xprv = match hdwallet_bitcoin::PrivKey::deserialize(xprv_str) {
@ -1075,7 +1075,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_createToAdd
let account = if account >= 0 { let account = if account >= 0 {
account as u32 account as u32
} else { } else {
return Err(format_err!("account argument must be positive")); return Err(format_err!("account argument must be nonnegative"));
}; };
let extsk = utils::java_string_to_rust(&env, extsk); let extsk = utils::java_string_to_rust(&env, extsk);
let to = utils::java_string_to_rust(&env, to); let to = utils::java_string_to_rust(&env, to);
@ -1157,7 +1157,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_shieldToAdd
let account = if account == 0 { let account = if account == 0 {
account as u32 account as u32
} else { } else {
return Err(format_err!("account argument {} must be positive", account)); return Err(format_err!("account argument {} must be nonnegative", account));
}; };
let extsk = utils::java_string_to_rust(&env, extsk); let extsk = utils::java_string_to_rust(&env, extsk);
let xprv_str = utils::java_string_to_rust(&env, xprv); let xprv_str = utils::java_string_to_rust(&env, xprv);