Merge remote-tracking branch 'main/master' into check-native-library-version-ECR-3148

Author: dmitry-timofeev

exonum-java-binding/CHANGELOG.md

@@ -18,7 +18,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Verification of native library compatibility when it is first loaded, to detect
   possible mismatch between an installed exonum-java application and the version
-  used in a service project. (#882) 
+  used in a service project. (#882)
+- `Block#isEmpty()`
 
 ## [0.6.0]- 2019-05-08
 

exonum-java-binding/core/checkstyle-suppressions.xml

@@ -17,4 +17,5 @@
 
     <!-- Allow `aBlock` name -->
     <suppress files="BlockchainIntegrationTest\.java" checks="MethodName"/>
+    <suppress files="BlockTest\.java" checks="MethodName"/>
 </suppressions>

exonum-java-binding/core/rust/exonum-java/TUTORIAL.md

@@ -100,7 +100,7 @@ There are also optional parameters useful for debugging purposes, logging config
 
 ```$sh
 $ exonum-java run -d testnet/db -c testnet/node.toml \
-    --ejb-port 6000 \
+    --ejb-port 7000 \
     --ejb-log-config-path "log4j.xml" \
     --consensus-key-pass pass \
     --service-key-pass pass \
@@ -116,7 +116,7 @@ from a debugger:
 ```sh
 $ exonum-java run -d testnet/db -c testnet/node.toml --public-api-address 127.0.0.1:3000 \
     --ejb-log-config-path "log4j-fallback.xml" \
-    --ejb-port 6000 \
+    --ejb-port 7000 \
     --jvm-debug localhost:8000
 ```
 

exonum-java-binding/core/rust/exonum-java/start_cryptocurrency_node.sh

@@ -73,4 +73,4 @@ cargo +$RUST_COMPILER_VERSION run -- run -d testnet/db -c testnet/node.toml \
  --service-key-pass pass \
  --public-api-address 127.0.0.1:3000 \
  --ejb-log-config-path $EJB_LOG_CONFIG_PATH \
- --ejb-port 6000
+ --ejb-port 7000

exonum-java-binding/core/rust/exonum-java/start_qa_node.sh

@@ -95,7 +95,7 @@ for i in $(seq 0 $((node_count - 1)))
 do
     port=$((3000 + i))
     private_port=$((port + 100))
-    ejb_port=$((6000 + i))
+    ejb_port=$((7000 + i))
     cargo +$RUST_COMPILER_VERSION run -- run \
      -c testnet/node_$i.toml \
      -d testnet/db/$i \

exonum-java-binding/core/src/main/java/com/exonum/binding/blockchain/Block.java

@@ -58,6 +58,14 @@ public abstract class Block {
    */
   public abstract long getHeight();
 
+  /**
+   * Returns true if this block is empty:
+   * contains no {@linkplain #getNumTransactions() transactions}.
+   */
+  public final boolean isEmpty() {
+    return getNumTransactions() == 0;
+  }
+
   /**
    * Number of transactions in this block.
    */

exonum-java-binding/core/src/test/java/com/exonum/binding/blockchain/BlockTest.java

@@ -16,13 +16,41 @@
 
 package com.exonum.binding.blockchain;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.exonum.binding.blockchain.Block.Builder;
 import com.exonum.binding.common.hash.HashCode;
+import com.exonum.binding.common.hash.HashFunction;
+import com.exonum.binding.common.hash.Hashing;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class BlockTest {
 
+  @Test
+  void isEmpty() {
+    Block emptyBlock = aBlock()
+        .numTransactions(0)
+        .build();
+
+    assertTrue(emptyBlock.isEmpty());
+  }
+
+  @ParameterizedTest
+  @ValueSource(ints = {1, 2, Integer.MAX_VALUE})
+  void nonEmptyBlock(int numTransactions) {
+    Block nonEmptyBlock = aBlock()
+        .numTransactions(numTransactions)
+        .build();
+
+    assertFalse(nonEmptyBlock.isEmpty());
+  }
+
   @Test
   void verifyEquals() {
     EqualsVerifier.forClass(AutoValue_Block.class)
@@ -33,4 +61,17 @@ void verifyEquals() {
         .withPrefabValues(HashCode.class, HashCode.fromInt(1), HashCode.fromInt(2))
         .verify();
   }
+
+  private static Builder aBlock() {
+    HashFunction hashFunction = Hashing.sha256();
+    long blockHeight = 1;
+    return Block.builder()
+        .proposerId(0)
+        .height(blockHeight)
+        .numTransactions(0)
+        .blockHash(hashFunction.hashLong(blockHeight))
+        .previousBlockHash(hashFunction.hashLong(blockHeight - 1))
+        .txRootHash(hashFunction.hashString("transactions at" + blockHeight, UTF_8))
+        .stateHash(hashFunction.hashString("state hash at " + blockHeight, UTF_8));
+  }
 }

exonum-java-binding/cryptocurrency-demo/Readme.md

@@ -59,7 +59,7 @@ $ npm run build
 Run the frontend application:
 
 ```sh
-$ npm start -- --port=6040 --api-root=http://127.0.0.1:6000 --explorer-root=http://127.0.0.1:3000
+$ npm start -- --port=6040 --api-root=http://127.0.0.1:7000 --explorer-root=http://127.0.0.1:3000
 ```
 
 `--port` is a port for Node.JS app.

exonum-java-binding/cryptocurrency-demo/start-cryptocurrency-demo.sh

@@ -67,4 +67,4 @@ ${EXONUM_JAVA_APP} run -d testnet/db -c testnet/node.toml \
  --consensus-key-pass pass \
  --service-key-pass pass \
  --public-api-address 127.0.0.1:3000 \
- --ejb-port 6000
+ --ejb-port 7000

exonum-light-client/checkstyle-suppressions.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ 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.
+  -->
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+    <!-- Allow `aBlock` name -->
+    <suppress files="BlockTest\.java" checks="MethodName"/>
+</suppressions>