Updated how transaction result is represented [ECR-3693] (#1174)

Use the protobuf message to represent the transaction execution result.

Update the exonum revision and the proto messages.

Author: dmitry-timofeev

exonum-java-binding/common/src/main/java/com/exonum/binding/common/blockchain/ExecutionStatuses.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2019 The Exonum Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.exonum.binding.common.blockchain;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.exonum.core.messages.Runtime.ErrorKind;
+import com.exonum.core.messages.Runtime.ExecutionError;
+import com.exonum.core.messages.Runtime.ExecutionStatus;
+import com.google.protobuf.Empty;
+
+/**
+ * Provides factory methods for creating some execution statuses, which represent a result
+ * of the runtime operation execution (most often — service transaction execution).
+ *
+ * <p>Only the factory methods for the most common statuses are provided;
+ * consider using the {@linkplain ExecutionStatus#newBuilder()} for other error kinds.
+ *
+ * @see ExecutionStatus
+ */
+public final class ExecutionStatuses {
+
+  private static final ExecutionStatus SUCCESS = ExecutionStatus.newBuilder()
+      .setOk(Empty.getDefaultInstance())
+      .build();
+
+  /**
+   * Creates a successful execution status.
+   */
+  public static ExecutionStatus success() {
+    return SUCCESS;
+  }
+
+  /**
+   * Creates an execution status corresponding to a service-defined error with an empty description.
+   * The status will have the <em>kind</em> field equal to {@link ErrorKind#SERVICE}.
+   *
+   * @param code a service-defined error code; must be non-negative
+   */
+  public static ExecutionStatus serviceError(int code) {
+    return serviceError(code, "");
+  }
+
+  /**
+   * Creates an execution status corresponding to a service-defined error.
+   * The status will have the <em>kind</em> field equal to {@link ErrorKind#SERVICE}.
+   *
+   * @param code a service-defined error code; must be non-negative
+   * @param description an error description; may be empty
+   */
+  public static ExecutionStatus serviceError(int code, String description) {
+    checkArgument(0 <= code, "Error code (%s) must be non-negative", code);
+    return ExecutionStatus.newBuilder()
+        .setError(ExecutionError.newBuilder()
+            .setKind(ErrorKind.SERVICE)
+            .setCode(code)
+            .setDescription(description))
+        .build();
+  }
+
+  private ExecutionStatuses() {}
+}

exonum-java-binding/common/src/main/java/com/exonum/binding/common/blockchain/TransactionResult.java

@@ -20,9 +20,9 @@
 
 import com.exonum.binding.common.crypto.PublicKey;
 import com.exonum.binding.common.hash.HashCode;
-import com.exonum.binding.messages.Consensus;
-import com.exonum.binding.messages.Consensus.ExonumMessage;
-import com.exonum.binding.messages.Runtime.AnyTx;
+import com.exonum.core.messages.Consensus;
+import com.exonum.core.messages.Consensus.ExonumMessage;
+import com.exonum.core.messages.Runtime.AnyTx;
 import com.google.common.base.MoreObjects;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;

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

@@ -19,8 +19,8 @@
 import com.exonum.binding.common.crypto.PublicKey;
 import com.exonum.binding.common.hash.HashCode;
 import com.exonum.binding.common.hash.Hashing;
-import com.exonum.binding.messages.Consensus;
-import com.exonum.binding.messages.Consensus.ExonumMessage;
+import com.exonum.core.messages.Consensus;
+import com.exonum.core.messages.Consensus.ExonumMessage;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 

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

@@ -25,11 +25,11 @@
 import com.exonum.binding.common.crypto.KeyPair;
 import com.exonum.binding.common.crypto.PublicKey;
 import com.exonum.binding.common.hash.HashCode;
-import com.exonum.binding.messages.Consensus;
-import com.exonum.binding.messages.Consensus.ExonumMessage;
-import com.exonum.binding.messages.Runtime.AnyTx;
-import com.exonum.binding.messages.Runtime.CallInfo;
-import com.exonum.binding.messages.Types;
+import com.exonum.core.messages.Consensus;
+import com.exonum.core.messages.Consensus.ExonumMessage;
+import com.exonum.core.messages.Runtime.AnyTx;
+import com.exonum.core.messages.Runtime.CallInfo;
+import com.exonum.core.messages.Types;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;

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

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2019 The Exonum Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.exonum.binding.common.blockchain;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+import com.exonum.core.messages.Runtime.ErrorKind;
+import com.exonum.core.messages.Runtime.ExecutionError;
+import com.exonum.core.messages.Runtime.ExecutionStatus;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+class ExecutionStatusesTest {
+
+  @Test
+  void success() {
+    ExecutionStatus s = ExecutionStatuses.success();
+    assertTrue(s.hasOk());
+  }
+
+  @ParameterizedTest
+  @MethodSource("errors")
+  void serviceError(int code, String description) {
+    ExecutionStatus s = ExecutionStatuses.serviceError(code, description);
+
+    assertTrue(s.hasError());
+    ExecutionError error = s.getError();
+    assertThat(error.getKind()).isEqualTo(ErrorKind.SERVICE);
+    assertThat(error.getCode()).isEqualTo(code);
+    assertThat(error.getDescription()).isEqualTo(description);
+  }
+
+  private static List<Arguments> errors() {
+    return ImmutableList.of(
+        arguments(0, "Min error code"),
+        arguments(1, ""),
+        arguments(Integer.MAX_VALUE, "Max error code")
+    );
+  }
+
+  @ParameterizedTest
+  @ValueSource(ints = {-1, -2, Integer.MIN_VALUE})
+  void serviceErrorRejectsNegative(int code) {
+    IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
+        () -> ExecutionStatuses.serviceError(code, ""));
+
+    assertThat(e).hasMessageContaining(String.valueOf(code));
+  }
+}