Iroha-java v1.3.0 (hyperledger-iroha#178)

* update to iroha:1.3.0-rc.1
* update containers to iroha:1.3.0

Signed-off-by: Alexey-N-Chernyshov <[email protected]>

Author: Alexey-N-Chernyshov

client/src/main/proto/commands.proto

@@ -126,12 +126,6 @@ message CallEngine {
     string input = 4;  // hex string
 }
 
-message CallModel{
-    message Payload {}
-    Payload payload = 1;
-    DataModelId dm_id = 2;
-}
-
 message Command {
     oneof command {
         AddAssetQuantity add_asset_quantity = 1;
@@ -154,6 +148,5 @@ message Command {
         CompareAndSetAccountDetail compare_and_set_account_detail = 18;
         SetSettingValue set_setting_value = 19;
         CallEngine call_engine = 20;
-        CallModel call_model = 21;
     }
 }

client/src/main/proto/primitive.proto

@@ -47,7 +47,6 @@ enum RolePermission {
   can_add_domain_asset_qty = 43;
   can_subtract_domain_asset_qty = 44;
   can_call_engine = 48;
-  can_call_model = 53;
 
   // Query permissions
   can_read_assets = 15;
@@ -137,10 +136,3 @@ message EngineReceipt {
   }
   repeated EngineLog logs = 5;
 }
-
-message DataModelId {
-    string name = 1;
-    string version = 2;
-}
-
-

client/src/test/groovy/jp/co/soramitsu/iroha/java/CommandsTest.groovy

@@ -18,6 +18,7 @@ class CommandsTest extends Specification {
 
     static IrohaAPI api
     static def iroha = new IrohaContainer()
+            .withIrohaDockerImage(IrohaContainer.defaultIrohaDockerImageWithBurrow)
             .withPeerConfig(
                     PeerConfig.builder()
                             .genesisBlock(getGenesisBlock())
@@ -93,17 +94,17 @@ class CommandsTest extends Specification {
         actual_value == expected_value
 
         where:
-        key            | value         | oldValue     | checkEmpty | expected_value
-        "initial_key1" | "updated_val" | "wrong_val"  | null       | "{ \"a@test\" : { \"initial_key1\" : \"initial_val\" } }"
-        "initial_key1" | "updated_val" | null         | null       | "{ \"a@test\" : { \"initial_key1\" : \"initial_val\" } }"
-        "initial_key2" | "updated_val" | "initial_val"| null       | "{ \"a@test\" : { \"initial_key2\" : \"updated_val\" } }"
-        "absent_key1"  | "value"       | null         | null       | "{ \"a@test\" : { \"absent_key1\" : \"value\" } }"
-        "absent_key2"  | "value"       | null         | true       | "{ \"a@test\" : { \"absent_key2\" : \"value\" } }"
+        key            | value         | oldValue      | checkEmpty | expected_value
+        "initial_key1" | "updated_val" | "wrong_val"   | null       | "{ \"a@test\" : { \"initial_key1\" : \"initial_val\" } }"
+        "initial_key1" | "updated_val" | null          | null       | "{ \"a@test\" : { \"initial_key1\" : \"initial_val\" } }"
+        "initial_key2" | "updated_val" | "initial_val" | null       | "{ \"a@test\" : { \"initial_key2\" : \"updated_val\" } }"
+        "absent_key1"  | "value"       | null          | null       | "{ \"a@test\" : { \"absent_key1\" : \"value\" } }"
+        "absent_key2"  | "value"       | null          | true       | "{ \"a@test\" : { \"absent_key2\" : \"value\" } }"
         // if value is empty, old value is not checked, like checkEmpty=false
-        "absent_key3"  | "value"       | "wrong"      | null       | "{ \"a@test\" : { \"absent_key3\" : \"value\" } }"
-        "absent_key4"  | "value"       | null         | false      | "{ \"a@test\" : { \"absent_key4\" : \"value\" } }"
-        "absent_key5"  | "value"       | "any_value"  | false      | "{ \"a@test\" : { \"absent_key5\" : \"value\" } }"
-        "absent_key6"  | "value"       | "any_value"  | true       | "{}"
+        "absent_key3"  | "value"       | "wrong"       | null       | "{ \"a@test\" : { \"absent_key3\" : \"value\" } }"
+        "absent_key4"  | "value"       | null          | false      | "{ \"a@test\" : { \"absent_key4\" : \"value\" } }"
+        "absent_key5"  | "value"       | "any_value"   | false      | "{ \"a@test\" : { \"absent_key5\" : \"value\" } }"
+        "absent_key6"  | "value"       | "any_value"   | true       | "{}"
     }
 
     @Unroll

client/src/test/groovy/jp/co/soramitsu/iroha/java/Ed25519Sha2Test.groovy

@@ -20,6 +20,7 @@ class Ed25519Sha2Test extends Specification {
 
     static IrohaAPI api
     static def iroha = new IrohaContainer()
+            .withIrohaDockerImage(IrohaContainer.defaultIrohaDockerImageWithURSA)
             .withPeerConfig(
                     PeerConfig.builder()
                             .genesisBlock(getGenesisBlock())
@@ -53,7 +54,7 @@ class Ed25519Sha2Test extends Specification {
         def qapi = new QueryAPI(api, account, new Ed25519Sha2SignatureBuilder())
 
         when: "send tx with Iroha builtin Ed25519/Sha3 with default builder without specifying SignatureBuilder"
-        def tx = Transaction.builder(defaultAccountId, )
+        def tx = Transaction.builder(defaultAccountId,)
                 .setAccountDetail(defaultAccountId, "key", "value")
                 .sign(defaultKeyPair)
                 .build()

client/src/test/groovy/jp/co/soramitsu/iroha/java/TransactionStatusObserverTest.groovy

@@ -87,7 +87,7 @@ class TransactionStatusObserverTest extends Specification {
         then:
         sent.get()
         esc.get()
-        // stateless validation success statuc can be omitted by iroha, so we do not expect it any more
+        // stateless validation success status can be omitted by iroha, so we do not expect it any more
 //        slvsucc.get()
         sfvsucc.get()
         committed.get()

testcontainers/build.gradle

@@ -8,7 +8,7 @@ repositories {
     maven { url 'https://jitpack.io' }
 }
 
-final def testContainersVersion = '1.15.1'
+final def testContainersVersion = '1.16.0'
 final def lombokVersion = '1.18.4'
 final def jacksonVersion = '2.9.7'
 final def spockVersion = '1.2-groovy-2.4'
@@ -57,4 +57,4 @@ sonarqube {
         property "sonar.projectKey", "${project.group}:${rootProject.name}.${project.name}"
         property "sonar.projectName", "${project.group}:${rootProject.name}.${project.name}"
     }
-}
+}

testcontainers/docker/Dockerfile

@@ -1,5 +1,4 @@
-#this corresponds to iroha 1.3.0.rc1
-FROM ghcr.io/hyperledger/iroha:df8b9258ff546ebf7dcdbe6ca2f52ac82f94922138649fe9fc875558b0c3e715-debug
+FROM ghcr.io/hyperledger/iroha:1.3.0
 WORKDIR /opt/iroha_data
 ENTRYPOINT [""]
 COPY run-iroha.sh wait-for-it.sh /

testcontainers/docker/build_and_push.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export TAG=ghcr.io/hyperledger/iroha:df8b9258ff546ebf7dcdbe6ca2f52ac82f94922138649fe9fc875558b0c3e715-debug
+export TAG=ghcr.io/hyperledger/iroha:1.3.0
 
 docker build -t $TAG --compress --squash .
 docker push $TAG

testcontainers/src/main/java/jp/co/soramitsu/iroha/testcontainers/IrohaContainer.java

@@ -32,8 +32,12 @@ public class IrohaContainer extends FailureDetectingExternalResource implements
   public static final String defaultPostgresAlias = "iroha.postgres";
   public static final String defaultIrohaAlias = "iroha";
   public static final String irohaWorkdir = "/opt/iroha_data";
-  //  this corresponds to iroha 1.3.0.rc1
-  public static final String defaultIrohaDockerImage = "ghcr.io/hyperledger/iroha:df8b9258ff546ebf7dcdbe6ca2f52ac82f94922138649fe9fc875558b0c3e715-debug";
+  // default last release
+  public static final String defaultIrohaDockerImage = "hyperledger/iroha:1.3.0";
+  // release with URSA integration for ed25519 SHA-2 algorithm
+  public static final String defaultIrohaDockerImageWithURSA = "hyperledger/iroha-ursa:1.3.0";
+  // release with Burrow integration for Solidity smart-contracts
+  public static final String defaultIrohaDockerImageWithBurrow = "hyperledger/iroha-burrow:1.3.0";
   public static final String defaultPostgresDockerImage = "postgres:11-alpine";
 
   // env vars
@@ -254,6 +258,7 @@ public URI getToriiAddress() {
 
   /**
    * Returns a URI for API of current peer over TLS.
+   *
    * @return
    */
   @SneakyThrows

testcontainers/src/main/java/jp/co/soramitsu/iroha/testcontainers/detail/IrohaConfig.java

@@ -43,7 +43,7 @@ public class IrohaConfig implements Cloneable {
   private int max_proposal_size = 1000;
 
   @Builder.Default
-  private int proposal_delay = 1000;
+  private int proposal_delay = 5000;
 
   @Builder.Default
   private int vote_delay = 1000;