Update core and support Service resume [ECR-4130] (#1389)

Updates to revision c46b533 of Core.

Adds service resuming support to the Java Runtime proxy
in Rust.

Also fixes the error conversion for exceptions in the service
constructor.

Author: Ilya Bogdanov

exonum-java-binding/common/src/main/java/com/exonum/binding/common/message/ParsedTransactionMessage.java

@@ -20,8 +20,8 @@
 
 import com.exonum.binding.common.crypto.PublicKey;
 import com.exonum.binding.common.hash.HashCode;
-import com.exonum.core.messages.Consensus;
 import com.exonum.core.messages.Consensus.ExonumMessage;
+import com.exonum.core.messages.Messages;
 import com.exonum.core.messages.Runtime.AnyTx;
 import com.google.common.base.MoreObjects;
 import com.google.protobuf.ByteString;
@@ -36,7 +36,7 @@ final class ParsedTransactionMessage implements TransactionMessage {
 
   // signedMessage is the source protocol buffers message; parsedMessage is its parsed
   // representation.
-  private final Consensus.SignedMessage signedMessage;
+  private final Messages.SignedMessage signedMessage;
   private final SignedMessage parsedMessage;
   private final AnyTx tx;
 
@@ -46,7 +46,7 @@ final class ParsedTransactionMessage implements TransactionMessage {
    * @throws IllegalArgumentException if the signed message does not contain an Exonum transaction
    *     message
    */
-  ParsedTransactionMessage(Consensus.SignedMessage signedMessage) {
+  ParsedTransactionMessage(Messages.SignedMessage signedMessage) {
     this.signedMessage = signedMessage;
     // Decode the signed message
     try {

exonum-java-binding/common/src/main/java/com/exonum/binding/common/message/SignedMessage.java

@@ -22,11 +22,12 @@
 import com.exonum.binding.common.hash.HashCode;
 import com.exonum.core.messages.Consensus;
 import com.exonum.core.messages.Consensus.ExonumMessage;
+import com.exonum.core.messages.Messages;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 
 /**
- * A wrapper around {@link Consensus.SignedMessage} protobuf message containing
+ * A wrapper around {@link Messages.SignedMessage} protobuf message containing
  * {@link Consensus.ExonumMessage}, which converts protobuf types into internal types.
  *
  * <p>It currently does not support verification of the signature against the author's public
@@ -54,13 +55,13 @@ private SignedMessage(ExonumMessage payload, PublicKey authorPk,
    * @param messageBytes the serialized message to parse
    * @return a signed message with exonum message as its payload
    * @throws InvalidProtocolBufferException if the given bytes are not a serialized
-   *     {@link Consensus.SignedMessage}; or if the payload of the message is not
+   *     {@link Messages.SignedMessage}; or if the payload of the message is not
    *     {@link Consensus.ExonumMessage}
    */
   public static SignedMessage parseFrom(byte[] messageBytes) throws InvalidProtocolBufferException {
     // Try to decode the SignedMessage container
     HashCode hash = sha256().hashBytes(messageBytes);
-    Consensus.SignedMessage message = Consensus.SignedMessage.parseFrom(messageBytes);
+    Messages.SignedMessage message = Messages.SignedMessage.parseFrom(messageBytes);
     return fromProto(message, hash);
   }
 
@@ -71,13 +72,13 @@ public static SignedMessage parseFrom(byte[] messageBytes) throws InvalidProtoco
    * @throws InvalidProtocolBufferException if a signed message does not contain a valid payload
    *     that is a serialized {@link Consensus.ExonumMessage}
    */
-  public static SignedMessage fromProto(Consensus.SignedMessage message)
+  public static SignedMessage fromProto(Messages.SignedMessage message)
       throws InvalidProtocolBufferException {
     HashCode hash = sha256().hashBytes(message.toByteArray());
     return fromProto(message, hash);
   }
 
-  private static SignedMessage fromProto(Consensus.SignedMessage message,
+  private static SignedMessage fromProto(Messages.SignedMessage message,
       HashCode messageHash) throws InvalidProtocolBufferException {
     // Try to decode the payload, which is stored as bytes. It is expected to be an ExonumMessage
     ByteString payloadBytes = message.getPayload();

exonum-java-binding/common/src/main/java/com/exonum/binding/common/message/TransactionMessage.java

@@ -26,8 +26,8 @@
 import com.exonum.binding.common.crypto.KeyPair;
 import com.exonum.binding.common.crypto.PublicKey;
 import com.exonum.binding.common.hash.HashCode;
-import com.exonum.core.messages.Consensus;
 import com.exonum.core.messages.Consensus.ExonumMessage;
+import com.exonum.core.messages.Messages;
 import com.exonum.core.messages.Runtime.AnyTx;
 import com.exonum.core.messages.Runtime.CallInfo;
 import com.exonum.core.messages.Types;
@@ -100,7 +100,7 @@ static Builder builder() {
    */
   static TransactionMessage fromBytes(byte[] bytes) {
     try {
-      Consensus.SignedMessage signedMessage = Consensus.SignedMessage.parseFrom(bytes);
+      Messages.SignedMessage signedMessage = Messages.SignedMessage.parseFrom(bytes);
       return new ParsedTransactionMessage(signedMessage);
     } catch (InvalidProtocolBufferException e) {
       throw new IllegalArgumentException(e);
@@ -228,7 +228,7 @@ public TransactionMessage build() {
 
       byte[] signature = cryptoFunction.signMessage(exonumMessage, keys.getPrivateKey());
 
-      Consensus.SignedMessage signedMessage = Consensus.SignedMessage.newBuilder()
+      Messages.SignedMessage signedMessage = Messages.SignedMessage.newBuilder()
           .setAuthor(Types.PublicKey.newBuilder()
               .setData(ByteString.copyFrom(authorPublicKey.toBytes()))
               .build())

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

@@ -25,6 +25,7 @@
 import com.exonum.core.messages.Consensus;
 import com.exonum.core.messages.Consensus.ExonumMessage;
 import com.exonum.core.messages.Consensus.Prevote;
+import com.exonum.core.messages.Messages;
 import com.exonum.core.messages.Runtime.AnyTx;
 import com.exonum.core.messages.Runtime.CallInfo;
 import com.exonum.core.messages.Types;
@@ -47,7 +48,7 @@ class WithSignedMessage {
     final ByteString signature = ByteString.copyFrom(new byte[Ed25519.SIGNATURE_BYTES]);
     final PublicKey authorPublicKey = PublicKey.fromHexString("abcd");
 
-    Consensus.SignedMessage signedMessage;
+    Messages.SignedMessage signedMessage;
 
     @BeforeEach
     void createSignedMessage() {
@@ -94,8 +95,8 @@ void toBytesRoundtrip() throws InvalidProtocolBufferException {
       byte[] serializedMessage = message.toBytes();
 
       // Decode as the protobuf message
-      Consensus.SignedMessage signedProtoFromBytes =
-          Consensus.SignedMessage.parseFrom(serializedMessage);
+      Messages.SignedMessage signedProtoFromBytes =
+          Messages.SignedMessage.parseFrom(serializedMessage);
 
       // Check it is equal to the original proto message
       assertThat(signedProtoFromBytes).isEqualTo(signedMessage);
@@ -114,7 +115,7 @@ void createMessageNotTx() {
         .build()
         .toByteArray();
 
-    Consensus.SignedMessage signedMessage = aSignedMessageProto()
+    Messages.SignedMessage signedMessage = aSignedMessageProto()
         .setPayload(ByteString.copyFrom(prevoteMessage))
         .build();
 
@@ -135,7 +136,7 @@ void testEquals() throws InvalidProtocolBufferException {
         .suppress(Warning.NULL_FIELDS)
         // Only the source signedMessage is compared
         .withOnlyTheseFields("signedMessage")
-        .withPrefabValues(Consensus.SignedMessage.class,
+        .withPrefabValues(Messages.SignedMessage.class,
             signedConsensusMessage(red),
             signedConsensusMessage(black))
         .withPrefabValues(SignedMessage.class,
@@ -151,7 +152,7 @@ private static SignedMessage signedMessage(String payload) throws InvalidProtoco
     return SignedMessage.fromProto(signedConsensusMessage(payload));
   }
 
-  private static Consensus.SignedMessage signedConsensusMessage(String payload) {
+  private static Messages.SignedMessage signedConsensusMessage(String payload) {
     return aSignedMessageProto()
         .setPayload(ExonumMessage.newBuilder()
             .setAnyTx(anyTx(payload))
@@ -160,8 +161,8 @@ private static Consensus.SignedMessage signedConsensusMessage(String payload) {
         .build();
   }
 
-  private static Consensus.SignedMessage.Builder aSignedMessageProto() {
-    return Consensus.SignedMessage.newBuilder()
+  private static Messages.SignedMessage.Builder aSignedMessageProto() {
+    return Messages.SignedMessage.newBuilder()
         // Set the author only and keep the rest as defaults as the parser requires a non-empty key
         .setAuthor(Types.PublicKey.newBuilder()
             .setData(ByteString.copyFrom(bytes(1, 2, 3, 4)))

exonum-java-binding/common/src/test/java/com/exonum/binding/common/message/ParsedTransactionMessageTest.java

@@ -26,8 +26,8 @@
 import com.exonum.binding.common.crypto.KeyPair;
 import com.exonum.binding.common.crypto.PublicKey;
 import com.exonum.binding.common.hash.HashCode;
-import com.exonum.core.messages.Consensus;
 import com.exonum.core.messages.Consensus.ExonumMessage;
+import com.exonum.core.messages.Messages;
 import com.exonum.core.messages.Types;
 import com.exonum.core.messages.Types.Signature;
 import com.google.protobuf.ByteString;
@@ -45,7 +45,7 @@ class SignedMessageTest {
   class ParsedFromTestData {
     private ExonumMessage payload;
     private byte[] testSignature;
-    private Consensus.SignedMessage message;
+    private Messages.SignedMessage message;
 
     @BeforeEach
     void createProtoMessage() {
@@ -57,7 +57,7 @@ void createProtoMessage() {
       Types.Signature signature = aSignature()
           .setData(ByteString.copyFrom(testSignature))
           .build();
-      message = Consensus.SignedMessage.newBuilder()
+      message = Messages.SignedMessage.newBuilder()
           .setPayload(payload.toByteString())
           .setAuthor(authorPk)
           .setSignature(signature)
@@ -102,7 +102,7 @@ void parseFromPayloadNotExonumMessage() {
         bytes("Invalid payload: not an ExonumMessage"));
     Types.PublicKey authorPk = aPublicKey().build();
     Types.Signature signature = aSignature().build();
-    byte[] message = Consensus.SignedMessage.newBuilder()
+    byte[] message = Messages.SignedMessage.newBuilder()
         .setPayload(invalidPayload)
         .setAuthor(authorPk)
         .setSignature(signature)