Pass instance status as bytes array [ECR-4119] (#1367)

Update the native to the newer revision (dfe9f7e2) of Core.

Pass the instance status as byte array, as int constant no
longer work [ECR-4119]

Co-authored-by: Ilya Bogdanov <[email protected]>

Author: 2 people

exonum-java-binding/common/src/main/proto

@@ -22,6 +22,7 @@ exonum-cli = "0.13.0-rc.2"
 exonum-crypto = "0.13.0-rc.2"
 exonum-derive = "0.13.0-rc.2"
 exonum-proto = "0.13.0-rc.2"
+exonum-rust-runtime = "0.13.0-rc.2"
 exonum-supervisor = "0.13.0-rc.2"
 exonum-testkit = "0.13.0-rc.2"
 exonum-time = "0.13.0-rc.2"
@@ -52,14 +53,15 @@ rpath = true
 
 # FIXME: using git dependency until Exonum 1.0 is released
 [patch.crates-io]
-exonum = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-testkit = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-time = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-build = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-derive = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-cli = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-explorer-service = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-proto = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-supervisor = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-crypto = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
-exonum-merkledb = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
+exonum = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-testkit = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-time = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-build = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-derive = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-cli = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-explorer-service = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-proto = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-rust-runtime = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-supervisor = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-crypto = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }
+exonum-merkledb = { git = "https://github.com/exonum/exonum", rev = "dfe9f7e2" }

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

@@ -6,6 +6,7 @@ authors = ["Exonum team <[email protected]>"]
 [dependencies]
 env_logger = "0.7"
 exonum-explorer-service = "0.13.0-rc.2"
+exonum-rust-runtime = "0.13.0-rc.2"
 exonum-supervisor = "0.13.0-rc.2"
 exonum-time = "0.13.0-rc.2"
 failure = "0.1"

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

@@ -16,6 +16,7 @@
 
 extern crate env_logger;
 extern crate exonum_explorer_service;
+extern crate exonum_rust_runtime;
 extern crate exonum_supervisor;
 extern crate exonum_time;
 extern crate java_bindings;

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

@@ -15,6 +15,7 @@
  */
 
 use exonum_explorer_service::ExplorerFactory;
+use exonum_rust_runtime::{DefaultInstance, RustRuntime, RustRuntimeBuilder, ServiceFactory};
 use exonum_supervisor::{mode::Mode as SupervisorMode, Supervisor};
 use exonum_time::TimeServiceFactory;
 use java_bindings::{
@@ -26,7 +27,6 @@ use java_bindings::{
         },
         exonum_merkledb::{Database, RocksDB},
         node::{ApiSender, Node, NodeChannel, NodeConfig as CoreNodeConfig},
-        runtime::rust::{DefaultInstance, RustRuntime, RustRuntimeBuilder, ServiceFactory},
     },
     Command, Config, DefaultConfigManager, EjbCommand, EjbCommandResult, Executor, InternalConfig,
     JavaRuntimeProxy,
@@ -45,7 +45,8 @@ pub fn run_node(command: Command) -> Result<(), failure::Error> {
 
 fn create_node(config: Config) -> Result<Node, failure::Error> {
     let node_config = config.run_config.node_config.clone();
-    let events_pool_capacity = &node_config.private_config.mempool.events_pool_capacity;
+    // TODO: rewrite with NodeBuilder API when it is available
+    let events_pool_capacity = &Default::default();
     let channel = NodeChannel::new(events_pool_capacity);
     let blockchain = create_blockchain(&config, &channel)?;
 
@@ -92,7 +93,7 @@ fn create_rust_runtime(channel: &NodeChannel) -> RustRuntime {
         .with_factory(TimeServiceFactory::default())
         .with_factory(Supervisor)
         .with_factory(ExplorerFactory)
-        .build(channel.endpoints.0.clone())
+        .build(channel.endpoints_sender())
 }
 
 fn create_java_runtime(config: &Config) -> JavaRuntimeProxy {

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

@@ -27,6 +27,7 @@ extern crate exonum_cli;
 #[macro_use]
 extern crate exonum_derive;
 extern crate exonum_proto;
+extern crate exonum_rust_runtime;
 extern crate exonum_supervisor;
 extern crate failure;
 pub extern crate jni;

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

@@ -22,6 +22,7 @@ use exonum::{
 };
 use exonum_merkledb::{ObjectHash, Snapshot};
 use failure;
+use futures::Future;
 use jni::objects::JClass;
 use jni::sys::{jbyteArray, jshort};
 use jni::JNIEnv;
@@ -66,7 +67,10 @@ impl Node {
         let verified = Verified::from_value(tx, pub_key.to_owned(), secret_key);
         let tx_hash = verified.object_hash();
         // TODO(ECR-3679): check Core behaviour/any errors on service inactivity
-        self.blockchain.sender().broadcast_transaction(verified)?;
+        self.blockchain
+            .sender()
+            .broadcast_transaction(verified)
+            .wait()?;
         Ok(tx_hash)
     }
 }

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

@@ -19,6 +19,8 @@ use exonum::{
     crypto::{Hash, PublicKey},
     exonum_merkledb::{BinaryValue, Snapshot},
     runtime::{
+        migrations::{InitMigrationError, MigrationScript},
+        versioning::Version,
         ArtifactId, CallInfo, Caller, ExecutionContext, ExecutionError, InstanceId, InstanceSpec,
         InstanceStatus, Mailbox, Runtime, RuntimeIdentifier, SnapshotExt, WellKnownRuntime,
     },
@@ -165,13 +167,15 @@ impl Runtime for JavaRuntimeProxy {
         &mut self,
         _snapshot: &dyn Snapshot,
         instance_spec: &InstanceSpec,
-        status: InstanceStatus,
+        status: &InstanceStatus,
     ) {
         let serialized_instance_spec: Vec<u8> = instance_spec.to_bytes();
+        let serialized_instance_status: Vec<u8> = status.to_bytes();
         unwrap_jni(self.exec.with_attached(|env| {
             let instance_spec =
                 JObject::from(env.byte_array_from_slice(&serialized_instance_spec)?);
-            let instance_status = status as i32;
+            let instance_status =
+                JObject::from(env.byte_array_from_slice(&serialized_instance_status)?);
 
             panic_on_exception(
                 env,
@@ -186,6 +190,15 @@ impl Runtime for JavaRuntimeProxy {
         }));
     }
 
+    fn migrate(
+        &self,
+        _new_artifact: &ArtifactId,
+        _data_version: &Version,
+    ) -> Result<Option<MigrationScript>, InitMigrationError> {
+        // TODO (ECR-3787): implement
+        Ok(None)
+    }
+
     fn execute(
         &self,
         context: ExecutionContext,

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

@@ -23,10 +23,10 @@ use exonum::{
     crypto::{PublicKey, SecretKey},
     exonum_merkledb::{self, BinaryValue},
     helpers::ValidatorId,
-    runtime::rust::ServiceFactory,
     runtime::ArtifactSpec,
 };
 use exonum_proto::ProtobufConvert;
+use exonum_rust_runtime::ServiceFactory;
 use exonum_testkit::{TestKit, TestKitBuilder};
 use exonum_time::{time_provider::TimeProvider, TimeServiceFactory};
 use jni::{

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

@@ -121,7 +121,7 @@ unsafe fn cache_methods(env: &JNIEnv) {
         &env,
         SERVICE_RUNTIME_ADAPTER_CLASS,
         "updateServiceStatus",
-        "([BI)V",
+        "([B[B)V",
     );
     RUNTIME_ADAPTER_EXECUTE_TX = get_method_id(
         &env,

exonum-java-binding/core/rust/src/testkit/mod.rs

@@ -29,7 +29,8 @@
 import com.exonum.binding.core.transaction.TransactionContext;
 import com.exonum.binding.core.transport.Server;
 import com.exonum.core.messages.Runtime.ErrorKind;
-import com.exonum.core.messages.Runtime.InstanceState;
+import com.exonum.core.messages.Runtime.InstanceStatus;
+import com.exonum.core.messages.Runtime.InstanceStatus.Simple;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -170,7 +171,7 @@ public boolean isArtifactDeployed(ServiceArtifactId id) {
    * Starts registration of a new service instance with the given specification.
    * It involves the initial configuration of the service instance with the given parameters.
    * The instance is not registered until
-   * {@link #updateInstanceStatus(ServiceInstanceSpec, InstanceState.Status)}
+   * {@link #updateInstanceStatus(ServiceInstanceSpec, InstanceStatus)}
    * is invoked with the {@code Status=Active}.
    *
    * @param fork a database access to apply configuration
@@ -253,9 +254,10 @@ public void initializeResumingService(Fork fork, ServiceInstanceSpec instanceSpe
    *     is not deployed; or unrecognized service status received
    */
   public void updateInstanceStatus(ServiceInstanceSpec instanceSpec,
-      InstanceState.Status instanceStatus) {
+      InstanceStatus instanceStatus) {
     synchronized (lock) {
-      switch (instanceStatus) {
+      Simple status = instanceStatus.getSimple();
+      switch (status) {
         case ACTIVE:
           activateService(instanceSpec);
           break;
@@ -264,7 +266,7 @@ public void updateInstanceStatus(ServiceInstanceSpec instanceSpec,
           break;
         default:
           String msg = String.format("Unexpected status %s received for the service %s",
-              instanceStatus.name(), instanceSpec.getName());
+              status, instanceSpec.getName());
           logger.error(msg);
           throw new IllegalArgumentException(msg);
       }

exonum-java-binding/core/rust/src/utils/jni_cache.rs

@@ -29,7 +29,7 @@
 import com.exonum.binding.core.transaction.ExecutionException;
 import com.exonum.core.messages.Runtime.ArtifactId;
 import com.exonum.core.messages.Runtime.InstanceSpec;
-import com.exonum.core.messages.Runtime.InstanceState;
+import com.exonum.core.messages.Runtime.InstanceStatus;
 import com.google.inject.Inject;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.OptionalInt;
@@ -176,15 +176,14 @@ void initializeResumingService(long forkHandle, byte[] instanceSpec, byte[] argu
    *
    * @param instanceSpec the service instance specification as a serialized {@link InstanceSpec}
    *     protobuf message
-   * @param numericInstanceStatus new status of the service instance as a numeric
-   *     representation of the {@link InstanceState.Status} enum.
-   * @see ServiceRuntime#updateInstanceStatus(ServiceInstanceSpec, InstanceState.Status)
+   * @param instanceStatus new status of the service instance as a serialized
+   *     representation of the {@link InstanceStatus} protobuf message
+   * @see ServiceRuntime#updateInstanceStatus(ServiceInstanceSpec, InstanceStatus)
    */
-  void updateServiceStatus(byte[] instanceSpec, int numericInstanceStatus) {
+  void updateServiceStatus(byte[] instanceSpec, byte[] instanceStatus) {
     ServiceInstanceSpec javaInstanceSpec = parseInstanceSpec(instanceSpec);
-    InstanceState.Status instanceStatus =
-        InstanceState.Status.forNumber(numericInstanceStatus);
-    serviceRuntime.updateInstanceStatus(javaInstanceSpec, instanceStatus);
+    InstanceStatus status = parseInstanceStatus(instanceStatus);
+    serviceRuntime.updateInstanceStatus(javaInstanceSpec, status);
   }
 
   private static ServiceInstanceSpec parseInstanceSpec(byte[] instanceSpec) {
@@ -199,6 +198,15 @@ private static ServiceInstanceSpec parseInstanceSpec(byte[] instanceSpec) {
     }
   }
 
+  private static InstanceStatus parseInstanceStatus(byte[] instanceStatus) {
+    try {
+      return InstanceStatus.parseFrom(instanceStatus);
+    } catch (InvalidProtocolBufferException e) {
+      logger.error(e);
+      throw new IllegalArgumentException(e);
+    }
+  }
+
   /**
    * Executes the service transaction.
    *

exonum-java-binding/core/src/main/java/com/exonum/binding/core/runtime/ServiceRuntime.java

@@ -33,6 +33,8 @@
 import com.exonum.binding.core.storage.database.Snapshot;
 import com.exonum.core.messages.Runtime.ArtifactId;
 import com.exonum.core.messages.Runtime.InstanceSpec;
+import com.exonum.core.messages.Runtime.InstanceStatus;
+import com.exonum.core.messages.Runtime.InstanceStatus.Simple;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -209,4 +211,25 @@ void afterCommit_AuditorNode() throws CloseFailuresException {
     assertThat(event.getValidatorId()).isEmpty();
   }
 
+  @Test
+  void updateServiceStatus() {
+    int serviceId = 1;
+    String serviceName = "s1";
+    ArtifactId artifact = ARTIFACT_ID;
+    InstanceSpec instanceSpec = InstanceSpec.newBuilder()
+        .setId(serviceId)
+        .setName(serviceName)
+        .setArtifact(artifact)
+        .build();
+    InstanceStatus status = InstanceStatus.newBuilder()
+        .setSimple(Simple.ACTIVE)
+        .build();
+
+    serviceRuntimeAdapter
+        .updateServiceStatus(instanceSpec.toByteArray(), status.toByteArray());
+
+    ServiceInstanceSpec expectedSpec = ServiceInstanceSpec
+        .newInstance(serviceName, serviceId, ServiceArtifactId.fromProto(artifact));
+    verify(serviceRuntime).updateInstanceStatus(expectedSpec, status);
+  }
 }

exonum-java-binding/core/src/main/java/com/exonum/binding/core/runtime/ServiceRuntimeAdapter.java

@@ -26,7 +26,8 @@
 import com.exonum.binding.core.storage.database.TemporaryDb;
 import com.exonum.binding.test.RequiresNativeLibrary;
 import com.exonum.binding.test.runtime.ServiceArtifactBuilder;
-import com.exonum.core.messages.Runtime.InstanceState.Status;
+import com.exonum.core.messages.Runtime.InstanceStatus;
+import com.exonum.core.messages.Runtime.InstanceStatus.Simple;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
@@ -81,9 +82,10 @@ void runtimeConfigurationTest(@TempDir Path tmpArtifactDir) throws Exception {
       // Initialize and register a service instance
       String name = "s1";
       ServiceInstanceSpec instanceSpec = ServiceInstanceSpec.newInstance(name, 1, ARTIFACT_ID);
+      InstanceStatus instanceStatus = InstanceStatus.newBuilder().setSimple(Simple.ACTIVE).build();
       Fork fork = database.createFork(cleaner);
       runtime.initiateAddingService(fork, instanceSpec, new byte[0]);
-      runtime.updateInstanceStatus(instanceSpec, Status.ACTIVE);
+      runtime.updateInstanceStatus(instanceSpec, instanceStatus);
       assertThat(runtime.findService(name)).isNotEmpty();
     }