Update native testkit JNI code for DS [ECR-3445] (#1161)

Author: skletsun

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

@@ -55,15 +55,15 @@ mod proto;
 mod proxy;
 mod runtime;
 mod storage;
-//mod testkit;
+mod testkit;
 pub mod utils;
 
 pub use self::handle::{cast_handle, drop_handle, to_handle, Handle};
 pub use handle::resource_manager::*;
 pub use proxy::*;
 pub use runtime::*;
 pub use storage::*;
-//pub use testkit::*;
+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/src/testkit/mod.rs

@@ -16,33 +16,38 @@
 
 //! Provides native methods for Java TestKit support.
 
-use self::time_provider::JavaTimeProvider;
+use std::{panic, sync::Arc};
+
 use exonum::{
-    blockchain::Block,
+    blockchain::{Block, InstanceCollection, InstanceConfig},
     crypto::{PublicKey, SecretKey},
     helpers::ValidatorId,
-    messages::{RawTransaction, Signed},
+    merkledb::BinaryValue,
+    runtime::InstanceSpec,
 };
-use exonum_merkledb::BinaryValue;
 use exonum_testkit::{TestKit, TestKitBuilder};
-use exonum_time::{time_provider::TimeProvider, TimeService};
-use handle::{cast_handle, drop_handle, to_handle, Handle};
+use exonum_time::{time_provider::TimeProvider, TimeServiceFactory};
 use jni::{
     objects::{JObject, JValue},
     sys::{jboolean, jbyteArray, jobjectArray, jshort},
     Executor, JNIEnv,
 };
-use proxy::ServiceProxy;
-use std::{panic, sync::Arc};
+
+use handle::{cast_handle, drop_handle, to_handle, Handle};
 use storage::View;
-use utils::{unwrap_exc_or, unwrap_exc_or_default};
+use utils::{convert_to_string, unwrap_exc_or, unwrap_exc_or_default};
+use {JavaRuntimeProxy, JniError, JniResult};
+
+use self::time_provider::JavaTimeProvider;
 
 mod time_provider;
 
 const KEYPAIR_CLASS: &str = "com/exonum/binding/common/crypto/KeyPair";
 const KEYPAIR_CTOR_SIGNATURE: &str = "([B[B)Lcom/exonum/binding/common/crypto/KeyPair;";
 const EMULATED_NODE_CLASS: &str = "com/exonum/binding/testkit/EmulatedNode";
 const EMULATED_NODE_CTOR_SIGNATURE: &str = "(ILcom/exonum/binding/common/crypto/KeyPair;)V";
+const SERVICE_SPECS_FIELD_TYPE: &str = "[Lcom/exonum/binding/testkit/ServiceSpec;";
+const TIME_PROVIDER_FIELD_TYPE: &str = "Lcom/exonum/binding/testkit/TimeProviderAdapter;";
 
 /// Creates TestKit instance with specified services and wires public API handlers.
 /// The caller is responsible for properly destroying TestKit instance and freeing
@@ -54,7 +59,8 @@ pub extern "system" fn Java_com_exonum_binding_testkit_TestKit_nativeCreateTestK
     services: jobjectArray,
     auditor: jboolean,
     validator_count: jshort,
-    time_provider: JObject,
+    time_service_spec: JObject,
+    runtime_adapter: JObject,
 ) -> Handle {
     let res = panic::catch_unwind(|| {
         let mut builder = if auditor == jni::sys::JNI_TRUE {
@@ -65,20 +71,18 @@ pub extern "system" fn Java_com_exonum_binding_testkit_TestKit_nativeCreateTestK
         builder = builder.with_validators(validator_count as _);
         let builder = {
             let executor = Executor::new(Arc::new(env.get_java_vm()?));
-            let num_services = env.get_array_length(services)?;
-            for i in 0..num_services {
-                let service = env.get_object_array_element(services, i)?;
-                let global_ref = env.new_global_ref(service)?;
-                let service = ServiceProxy::from_global_ref(executor.clone(), global_ref);
-                builder = builder.with_service(service);
-            }
 
-            // Handle Time Service
-            if !time_provider.is_null() {
-                let provider = JavaTimeProvider::new(executor.clone(), time_provider);
-                builder = builder.with_service(TimeService::with_provider(
-                    Box::new(provider) as Box<dyn TimeProvider>
-                ));
+            let runtime =
+                JavaRuntimeProxy::new(executor.clone(), env.new_global_ref(runtime_adapter)?);
+            builder = builder
+                .with_additional_runtime(runtime)
+                // TODO: Rewrite with protobuf: ECR-3689
+                .with_instances(instance_configs_from_java_array(&env, services)?);
+
+            if let Some(instance) =
+                time_service_instance_from_java(&env, executor.clone(), time_service_spec)?
+            {
+                builder = builder.with_rust_service(instance);
             }
 
             builder
@@ -156,9 +160,7 @@ pub extern "system" fn Java_com_exonum_binding_testkit_TestKit_nativeCreateBlock
                 env.auto_local(env.get_object_array_element(transactions, i as _)?);
             let serialized_tx: jbyteArray = serialized_tx_object.as_obj().into_inner();
             let serialized_tx = env.convert_byte_array(serialized_tx)?;
-            let transaction: Signed<RawTransaction> =
-                BinaryValue::from_bytes(serialized_tx.into()).unwrap();
-            raw_transactions.push(transaction);
+            raw_transactions.push(BinaryValue::from_bytes(serialized_tx.into()).unwrap());
         }
         let block = testkit
             .create_block_with_transactions(raw_transactions.into_iter())
@@ -202,7 +204,7 @@ fn serialize_block(env: &JNIEnv, block: Block) -> jni::errors::Result<jbyteArray
 
 fn create_java_keypair<'a>(
     env: &'a JNIEnv,
-    keypair: (&PublicKey, &SecretKey),
+    keypair: (PublicKey, SecretKey),
 ) -> jni::errors::Result<JValue<'a>> {
     let public_key_byte_array: JObject = env.byte_array_from_slice(&keypair.0[..])?.into();
     let secret_key_byte_array: JObject = env.byte_array_from_slice(&keypair.1[..])?.into();
@@ -213,3 +215,132 @@ fn create_java_keypair<'a>(
         &[secret_key_byte_array.into(), public_key_byte_array.into()],
     )
 }
+
+// Converts Java array of `TestKitServiceInstances` to vector of `InstanceConfig`.
+//
+// `TestKitServiceInstances` representation:
+//      String artifactId;
+//      byte[] deployArguments;
+//      ServiceSpec[] serviceSpecs;
+fn instance_configs_from_java_array(
+    env: &JNIEnv,
+    service_artifact_specs: jobjectArray,
+) -> JniResult<Vec<InstanceConfig>> {
+    let mut instance_configs = vec![];
+    let num_artifacts = env.get_array_length(service_artifact_specs)?;
+    for i in 0..num_artifacts {
+        env.with_local_frame(8, || {
+            let artifact_spec_obj = env.get_object_array_element(service_artifact_specs, i)?;
+
+            let artifact_id = get_field_as_string(env, artifact_spec_obj, "artifactId")?;
+            let deploy_args: jbyteArray = env
+                .get_field(artifact_spec_obj, "deployArguments", "[B")?
+                .l()?
+                .into_inner();
+            let deploy_args = env.convert_byte_array(deploy_args)?;
+            let service_specs_obj: jobjectArray = env
+                .get_field(artifact_spec_obj, "serviceSpecs", SERVICE_SPECS_FIELD_TYPE)?
+                .l()?
+                .into_inner();
+            // TODO: Avoid deploy arguments duplication after ECR-3690
+            let configs = parse_service_specs(env, service_specs_obj, artifact_id, deploy_args)?;
+            instance_configs.extend(configs);
+
+            Ok(JObject::null())
+        })?;
+    }
+    Ok(instance_configs)
+}
+
+// Converts Java array of `ServiceSpec` instances into vector of `InstanceConfig` for specific artifact.
+fn parse_service_specs(
+    env: &JNIEnv,
+    specs_array: jobjectArray,
+    artifact_id: String,
+    deploy_args: Vec<u8>,
+) -> JniResult<Vec<InstanceConfig>> {
+    let num_specs = env.get_array_length(specs_array)?;
+
+    let mut instance_configs = vec![];
+    for i in 0..num_specs {
+        env.with_local_frame(8, || {
+            let service_spec = env.get_object_array_element(specs_array, i)?;
+            let (spec, config) = parse_instance_spec(&env, service_spec, &artifact_id)?;
+            let cfg = InstanceConfig::new(spec, Some(deploy_args.to_bytes()), config);
+            instance_configs.push(cfg);
+
+            Ok(JObject::null())
+        })?;
+    }
+
+    Ok(instance_configs)
+}
+
+// Parses the `ServiceSpec` instance.
+//
+// `ServiceSpec` representation:
+//      String serviceName;
+//      int serviceId;
+//      byte[] configuration;
+fn parse_instance_spec(
+    env: &JNIEnv,
+    service_spec_obj: JObject,
+    artifact_id: impl AsRef<str>,
+) -> JniResult<(InstanceSpec, Vec<u8>)> {
+    let (service_id, service_name) = get_service_id_and_name(env, service_spec_obj)?;
+    let config_params: jbyteArray = env
+        .get_field(service_spec_obj, "configuration", "[B")?
+        .l()?
+        .into_inner();
+    let config = env.convert_byte_array(config_params)?;
+    let spec = InstanceSpec::new(service_id, service_name, artifact_id).map_err(|err| {
+        JniError::from(format!(
+            "Unable to create instance specification for the service with id {}: {}",
+            service_id, err
+        ))
+    })?;
+
+    Ok((spec, config))
+}
+
+// Creates `InstanceCollection` from `TimeServiceSpec` object.
+//
+// `TimeServiceSpec`
+//      TimeProviderAdapter timeProvider;
+//      String serviceName;
+//      int serviceId;
+fn time_service_instance_from_java(
+    env: &JNIEnv,
+    executor: Executor,
+    time_service_spec: JObject,
+) -> JniResult<Option<InstanceCollection>> {
+    if time_service_spec.is_null() {
+        return Ok(None);
+    }
+
+    let (service_id, service_name) = get_service_id_and_name(env, time_service_spec)?;
+    let time_provider = env
+        .get_field(time_service_spec, "timeProvider", TIME_PROVIDER_FIELD_TYPE)?
+        .l()?;
+
+    let provider = JavaTimeProvider::new(executor.clone(), time_provider);
+    let factory = TimeServiceFactory::with_provider(Arc::new(provider) as Arc<dyn TimeProvider>);
+    let instance = InstanceCollection::new(factory).with_instance(service_id, service_name, ());
+
+    Ok(Some(instance))
+}
+
+// Returns id and name value from corresponding instances of Java objects.
+fn get_service_id_and_name(env: &JNIEnv, service_obj: JObject) -> JniResult<(u32, String)> {
+    let service_id = env.get_field(service_obj, "serviceId", "I")?.i()? as u32;
+    let service_name = get_field_as_string(env, service_obj, "serviceName")?;
+    Ok((service_id, service_name))
+}
+
+// Returns String value of instance's field.
+fn get_field_as_string(env: &JNIEnv, obj: JObject, field_name: &str) -> JniResult<String> {
+    convert_to_string(
+        env,
+        env.get_field(obj, field_name, "Ljava/lang/String;")?.l()?,
+    )
+}