Merge branch 'master' into ECR-3056

Author: dmitry-timofeev

exonum-java-binding/core/rust/Cargo.lock

@@ -21,7 +21,7 @@ exonum-testkit = "0.11"
 chrono = "0.4.7"
 failure = "0.1.1"
 toml = "0.4.6"
-jni = { git = "https://github.com/jni-rs/jni-rs", branch = "auto-detach-threads", version = "0.12.3", features = ["invocation"] }
+jni = { version = "0.13.0", features = ["invocation"] }
 lazy_static = "1.3.0"
 log = "0.4.1"
 parking_lot = "0.6"

exonum-java-binding/core/rust/Cargo.toml

@@ -18,7 +18,6 @@ extern crate lazy_static;
 extern crate tempfile;
 
 pub mod example_proxy;
-pub mod executor;
 pub mod fake_service;
 pub mod mock;
 pub mod test_service;

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

@@ -59,3 +59,4 @@ pub use storage::*;
 pub use testkit::*;
 
 pub use jni::errors::{Error as JniError, ErrorKind as JniErrorKind, Result as JniResult};
+pub use jni::Executor;

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

@@ -12,12 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod executor;
 mod node;
 mod service;
 mod transaction;
 
-pub use self::executor::*;
 pub use self::node::*;
 pub use self::service::*;
 pub use self::transaction::*;

exonum-java-binding/core/rust/integration_tests/tests/executor.rs

@@ -24,12 +24,12 @@ use exonum::{
 use failure;
 use jni::objects::JClass;
 use jni::sys::{jbyteArray, jshort};
+use jni::Executor;
 use jni::JNIEnv;
 
 use std::{panic, ptr};
 
 use handle::{cast_handle, drop_handle, to_handle, Handle};
-use proxy::Executor;
 use storage::View;
 use utils::{unwrap_exc_or, unwrap_exc_or_default, unwrap_jni_verbose};
 use JniResult;