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

Migrate to Rust 2018 edition 

Requires a minimum of Rust 1.31.
This commit is contained in:
Jack Grigg 2019-02-11 15:11:09 +00:00
parent c4231fb404
commit 886017a4f5
No known key found for this signature in database
GPG Key ID: 1B8D649257DB0829
2 changed files with 38 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -7,6 +7,7 @@ authors = [
]
description = "JNI backend for the Android wallet SDK"
publish = false
edition = "2018"
[dependencies]
android_logger = "0.6"

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

@ -1,25 +1,6 @@
extern crate failure;
#[macro_use]
extern crate log;
extern crate android_logger;
extern crate ff;
extern crate jni;
extern crate log_panics;
extern crate pairing;
extern crate protobuf;
extern crate rand;
extern crate rusqlite;
extern crate sapling_crypto;
extern crate time;
extern crate zcash_client_backend;
extern crate zcash_primitives;
extern crate zip32;
#[cfg(test)]
extern crate tempfile;
mod sql;
const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x76b8_09bb;
@ -49,7 +30,10 @@ use crate::sql::{
};
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(_env: JNIEnv, _: JClass) {
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(
_env: JNIEnv<'_>,
_: JClass<'_>,
) {
android_logger::init_once(
Filter::default().with_min_level(Level::Trace),
Some("cash.z.rust.logs"),
@ -62,9 +46,9 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(_env:
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initDataDb(
env: JNIEnv,
_: JClass,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_data: JString<'_>,
) -> jboolean {
let db_data: String = env
.get_string(db_data)
@ -82,9 +66,9 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initDataDb(
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initAccountsTable(
env: JNIEnv,
_: JClass,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_data: JString<'_>,
seed: jbyteArray,
accounts: jint,
) -> jobjectArray {
@ -146,9 +130,9 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initAccountsTab
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initBlocksTable(
env: JNIEnv,
_: JClass,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_data: JString<'_>,
height: jint,
time: jlong,
sapling_tree: jbyteArray,
@ -176,9 +160,9 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initBlocksTable
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getAddress(
env: JNIEnv,
_: JClass,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_data: JString<'_>,
account: jint,
) -> jstring {
let db_data: String = env
@ -208,9 +192,9 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getAddress(
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getBalance(
env: JNIEnv,
_: JClass,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_data: JString<'_>,
account: jint,
) -> jlong {
let db_data: String = env
@ -235,9 +219,9 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getBalance(
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getReceivedMemoAsUtf8(
env: JNIEnv,
_: JClass,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_data: JString<'_>,
id_note: jlong,
) -> jstring {
let db_data: String = env
@ -260,9 +244,9 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getReceivedMemo
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getSentMemoAsUtf8(
env: JNIEnv,
_: JClass,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_data: JString<'_>,
id_note: jlong,
) -> jstring {
let db_data: String = env
@ -285,10 +269,10 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getSentMemoAsUt
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_scanBlocks(
env: JNIEnv,
_: JClass,
db_cache: JString,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_cache: JString<'_>,
db_data: JString<'_>,
) -> jboolean {
let db_cache: String = env
.get_string(db_cache)
@ -310,16 +294,16 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_scanBlocks(
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_sendToAddress(
env: JNIEnv,
_: JClass,
db_data: JString,
env: JNIEnv<'_>,
_: JClass<'_>,
db_data: JString<'_>,
account: jint,
extsk: JString,
to: JString,
extsk: JString<'_>,
to: JString<'_>,
value: jlong,
memo: JString,
spend_params: JString,
output_params: JString,
memo: JString<'_>,
spend_params: JString<'_>,
output_params: JString<'_>,
) -> jlong {
let db_data: String = env
.get_string(db_data)