Fix issue with stable Rust compiler [ECR-3073] (#884)

Fix the path to the 'java_bindings' library passed to JVM so that it
matches the location of the library built and used by native ITs.

This issue occurred since 1.32.0 on Mac only.

Author: skletsun

.travis.yml

@@ -29,7 +29,7 @@ addons:
 
 env:
   global:
-    - RUST_COMPILER_VERSION=1.32.0
+    - RUST_COMPILER_VERSION=stable
     - OSX_PACKAGES="libsodium rocksdb pkg-config protobuf"
     - ROCKSDB_LIB_DIR=/usr/lib
     - SNAPPY_LIB_DIR=/usr/lib/x86_64-linux-gnu

CONTRIBUTING.md

@@ -19,8 +19,7 @@ You need to install the following dependencies:
   * Linux or macOS. Windows support is coming soon. <!-- TODO: Link Java roadmap when it is published -->
   * [JDK 1.8+](https://jdk.java.net/12/).
   * [Maven 3.5+](https://maven.apache.org/download.cgi).
-  * [Rust 1.32.0](https://www.rust-lang.org/).
-  To install a specific Rust version, use `rustup install 1.32.0` command.
+  * [Stable Rust](https://www.rust-lang.org/tools/install).
   * The [system dependencies](https://exonum.com/doc/version/0.11/get-started/install/) of Exonum. 
   You do _not_ need to manually fetch and compile Exonum.
   * For automatic packaging of the Exonum Java app you need [CMake](https://cmake.org/) installed in your system. 

exonum-java-binding/core/pom.xml

@@ -21,9 +21,11 @@
     <project.build.headersDirectory>${project.build.directory}/native-headers</project.build.headersDirectory>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <!-- TODO: stable does not work well until ECR-1839 is resolved. -->
-    <rust.compiler.version>1.32.0</rust.compiler.version>
-    <rust.compiler.features>resource-manager</rust.compiler.features>
+    <rust.compiler.version>stable</rust.compiler.version>
+    <!-- Features for integration testing. At least "resource-manager" is required by Java integration tests. Ideally,
+     keeping them in sync with the ones that `integration_tests` crate require from the `java_bindings` crate allows
+     the native integration tests to avoid recompilation of the `java_binding` library. -->
+    <rust.compiler.features>resource-manager invocation</rust.compiler.features>
     <rust.itSubCrate>integration_tests</rust.itSubCrate>
     <rust.appSubCrate>exonum-java</rust.appSubCrate>
     <!--A directory containing libjava_bindings native library-->

exonum-java-binding/core/rust/integration_tests/src/vm.rs

@@ -182,12 +182,18 @@ fn project_root_dir() -> PathBuf {
     PathBuf::from(env!("CARGO_MANIFEST_DIR"))
 }
 
+/// The relative path to a directory that contains runtime dependencies of the integration tests
+/// executed with `cargo test`. These dependencies include `java_bindings` library, which
+/// is also required and loaded by Java code.
+///
+/// This path is included in `java.library.path` JVM property, so that `java_bindings` library
+/// can be discovered and loaded by Java.
 #[cfg(debug_assertions)]
 fn target_path() -> &'static str {
-    "target/debug"
+    "target/debug/deps"
 }
 
 #[cfg(not(debug_assertions))]
 fn target_path() -> &'static str {
-    "target/release"
+    "target/release/deps"
 }

exonum-java-binding/core/rust/src/proxy/node.rs

@@ -117,7 +117,6 @@ pub extern "system" fn Java_com_exonum_binding_service_NodeProxy_nativeSubmit(
     service_id: jshort,
     transaction_id: jshort,
 ) -> jbyteArray {
-    use std::ptr;
     use utils::convert_hash;
     let res = panic::catch_unwind(|| {
         let node = cast_handle::<NodeContext>(node_handle);

exonum-java-binding/tests_profile

@@ -49,8 +49,7 @@ export JAVA_LIB_DIR="$(find ${JAVA_HOME} -type f -name libjvm.\* | xargs -n1 dir
 echo "JAVA_LIB_DIR=${JAVA_LIB_DIR}"
 
 # Version of Rust used to build tests.
-# Using 1.32.0 until ECR-2982 is fixed.
-export RUST_COMPILER_VERSION="${RUST_COMPILER_VERSION:-1.32.0}"
+export RUST_COMPILER_VERSION="${RUST_COMPILER_VERSION:-stable}"
 echo "RUST_COMPILER_VERSION: ${RUST_COMPILER_VERSION}"
 
 # Find the directory containing Rust libstd.