Remove cfg(target_os="android") restriction

The crate lives inside the Android SDK, and will only ever target
Android devices, so it's fine to simplify here.

Cargo.toml

@@ -9,7 +9,10 @@ description = "JNI backend for the Android wallet SDK"
 publish = false
 
 [dependencies]
+android_logger = "0.6"
 failure = "0.1"
+jni = { version = "0.10", default-features = false }
+log-panics = "2.0.0"
 protobuf = "2"
 rand = "0.4"
 rusqlite = { version = "0.15", features = ["bundled"] }
@@ -39,11 +42,6 @@ rev = "89cfef8515d5d88809c485a44fdc54572b9e5666"
 git = "https://github.com/str4d/librustzcash.git"
 rev = "89cfef8515d5d88809c485a44fdc54572b9e5666"
 
-[target.'cfg(target_os="android")'.dependencies]
-jni = { version = "0.10", default-features = false }
-android_logger = "0.6"
-log-panics = "2.0.0"
-
 [lib]
 name = "zcashwalletsdk"
 path = "src/main/rust/lib.rs"

src/main/rust/lib.rs

@@ -16,45 +16,37 @@ mod sql;
 
 const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x76b8_09bb;
 
-/// JNI interface
+extern crate android_logger;
-#[cfg(target_os = "android")]
+extern crate jni;
-#[allow(non_snake_case)]
+extern crate log_panics;
-pub mod android {
-    extern crate android_logger;
-    extern crate jni;
-    extern crate log_panics;
 
-    use log::Level;
+use log::Level;
-    use std::path::Path;
+use std::path::Path;
-    use zcash_client_backend::{
+use zcash_client_backend::{
     constants::{HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, HRP_SAPLING_PAYMENT_ADDRESS_TEST},
     encoding::{
         decode_extended_spending_key, decode_payment_address, encode_extended_spending_key,
     },
     note_encryption::Memo,
     prover::LocalTxProver,
-    };
+};
-    use zcash_primitives::transaction::components::Amount;
+use zcash_primitives::transaction::components::Amount;
-    use zip32::{ChildIndex, ExtendedFullViewingKey, ExtendedSpendingKey};
+use zip32::{ChildIndex, ExtendedFullViewingKey, ExtendedSpendingKey};
 
-    use self::android_logger::Filter;
+use self::android_logger::Filter;
-    use self::jni::objects::{JClass, JString};
+use self::jni::objects::{JClass, JString};
-    use self::jni::sys::{
+use self::jni::sys::{
     jboolean, jbyteArray, jint, jlong, jobjectArray, jsize, jstring, JNI_FALSE, JNI_TRUE,
-    };
+};
-    use self::jni::JNIEnv;
+use self::jni::JNIEnv;
 
-    use super::SAPLING_CONSENSUS_BRANCH_ID;
+use crate::sql::{
-    use crate::sql::{
     get_address, get_balance, init_accounts_table, init_blocks_table, init_data_database,
     scan_cached_blocks, send_to_address,
-    };
+};
 
-    #[no_mangle]
+#[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(
+pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(_env: JNIEnv, _: JClass) {
-        _env: JNIEnv,
-        _: JClass,
-    ) {
     android_logger::init_once(
         Filter::default().with_min_level(Level::Trace),
         Some("cash.z.rust.logs"),
@@ -63,14 +55,14 @@ pub mod android {
     log_panics::init();
 
     debug!("logs have been initialized successfully");
-    }
+}
 
-    #[no_mangle]
+#[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initDataDb(
+pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initDataDb(
     env: JNIEnv,
     _: JClass,
     db_data: JString,
-    ) -> jboolean {
+) -> jboolean {
     let db_data: String = env
         .get_string(db_data)
         .expect("Couldn't get Java string!")
@@ -83,16 +75,16 @@ pub mod android {
             JNI_FALSE
         }
     }
-    }
+}
 
-    #[no_mangle]
+#[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initAccountsTable(
+pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initAccountsTable(
     env: JNIEnv,
     _: JClass,
     db_data: JString,
     seed: jbyteArray,
     accounts: jint,
-    ) -> jobjectArray {
+) -> jobjectArray {
     let db_data: String = env
         .get_string(db_data)
         .expect("Couldn't get Java string!")
@@ -150,17 +142,17 @@ pub mod android {
             .expect("Couldn't set Java array element!");
     }
     jret
-    }
+}
 
-    #[no_mangle]
+#[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initBlocksTable(
+pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initBlocksTable(
     env: JNIEnv,
     _: JClass,
     db_data: JString,
     height: jint,
     time: jlong,
     sapling_tree: jbyteArray,
-    ) -> jboolean {
+) -> jboolean {
     let db_data: String = env
         .get_string(db_data)
         .expect("Couldn't get Java string!")
@@ -180,15 +172,15 @@ pub mod android {
             JNI_FALSE
         }
     }
-    }
+}
 
-    #[no_mangle]
+#[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getAddress(
+pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getAddress(
     env: JNIEnv,
     _: JClass,
     db_data: JString,
     account: jint,
-    ) -> jstring {
+) -> jstring {
     let db_data: String = env
         .get_string(db_data)
         .expect("Couldn't get Java string!")
@@ -212,15 +204,15 @@ pub mod android {
 
     let output = env.new_string(addr).expect("Couldn't create Java string!");
     output.into_inner()
-    }
+}
 
-    #[no_mangle]
+#[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getBalance(
+pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getBalance(
     env: JNIEnv,
     _: JClass,
     db_data: JString,
     account: jint,
-    ) -> jlong {
+) -> jlong {
     let db_data: String = env
         .get_string(db_data)
         .expect("Couldn't get Java string!")
@@ -239,15 +231,15 @@ pub mod android {
             -1
         }
     }
-    }
+}
 
-    #[no_mangle]
+#[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_scanBlocks(
+pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_scanBlocks(
     env: JNIEnv,
     _: JClass,
     db_cache: JString,
     db_data: JString,
-    ) -> jboolean {
+) -> jboolean {
     let db_cache: String = env
         .get_string(db_cache)
         .expect("Couldn't get Java string!")
@@ -264,10 +256,10 @@ pub mod android {
             JNI_FALSE
         }
     }
-    }
+}
 
-    #[no_mangle]
+#[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_sendToAddress(
+pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_sendToAddress(
     env: JNIEnv,
     _: JClass,
     db_data: JString,
@@ -278,7 +270,7 @@ pub mod android {
     memo: JString,
     spend_params: JString,
     output_params: JString,
-    ) -> jlong {
+) -> jlong {
     let db_data: String = env
         .get_string(db_data)
         .expect("Couldn't get Java string!")
@@ -311,8 +303,7 @@ pub mod android {
         .expect("Couldn't get Java string!")
         .into();
 
-        let extsk =
+    let extsk = match decode_extended_spending_key(HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, &extsk) {
-            match decode_extended_spending_key(HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, &extsk) {
         Ok(extsk) => extsk,
         Err(e) => {
             error!("Invalid ExtendedSpendingKey: {}", e);
@@ -359,5 +350,4 @@ pub mod android {
             -1
         }
     }
-    }
 }