Merge pull request #72 from vsbogd/new-contract-version

Upgrade snet-sdk-java to platform-contracts v1.0.1

Author: vsbogd

README.md

@@ -144,7 +144,7 @@ execute:
 docker run -d \
     --name java-sdk-integration-environment \
     -p 5002:5002 -p 8545:8545 -p 7000:7000 \
-    singularitynet/java-sdk-integration-test-env:3.0.0
+    singularitynet/java-sdk-integration-test-env:5.0.1
 ```
 Then you can run build with integration testing using:
 ```

integration/tag

@@ -1 +1 @@
-TAG=3.0.0
+TAG=5.0.1

plugin/core/src/test/java/io/singularitynet/sdk/plugin/ServiceApiGetterTest.java

@@ -19,7 +19,7 @@
 import io.ipfs.api.IPFS;
 import io.ipfs.multihash.Multihash;
 import org.web3j.protocol.core.RemoteCall;
-import org.web3j.tuples.generated.Tuple4;
+import org.web3j.tuples.generated.Tuple3;
 
 import io.singularitynet.sdk.common.Utils;
 import io.singularitynet.sdk.contracts.Registry;
@@ -45,10 +45,9 @@ public void setUp() throws IOException {
                     eq(Utils.strToBytes32(SERVICE_ID))))
             .thenReturn(new RemoteCall<>(
                         () -> {
-                            return new Tuple4<>(true,
+                            return new Tuple3<>(true,
                                     Utils.strToBytes32(SERVICE_ID),
-                                    Utils.strToBytes("ipfs://" + METADATA_HASH),
-                                    Collections.emptyList());
+                                    Utils.strToBytes("ipfs://" + METADATA_HASH));
                         }));
 
         ipfs = mock(IPFS.class);

pom.xml

@@ -12,13 +12,13 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <platform-contracts.version>1.0.0</platform-contracts.version>
+    <platform-contracts.version>1.0.1</platform-contracts.version>
     <snet-daemon.version>3.0.0</snet-daemon.version>
     <protobuf.version>3.5.1</protobuf.version>
     <grpc.version>1.28.0</grpc.version>
     <web3j.version>4.2.0-android</web3j.version>
     <java-sdk-integration-test-env.image>singularitynet/java-sdk-integration-test-env</java-sdk-integration-test-env.image>
-    <java-sdk-integration-test-env.version>3.0.0</java-sdk-integration-test-env.version>
+    <java-sdk-integration-test-env.version>5.0.1</java-sdk-integration-test-env.version>
   </properties>
 
   <repositories>

sdk/src/main/java/io/singularitynet/sdk/registry/RegistryContract.java

@@ -35,7 +35,7 @@ public RegistryContract(Registry registry) {
     public Optional<OrganizationRegistration> getOrganizationById(String orgId) {
         return wrapExceptions(() -> {
             log.info("Get organization from Registry, orgId: {}", orgId);
-            Tuple7<Boolean, byte[], byte[], String, List<String>, List<byte[]>, List<byte[]>> result =
+            Tuple6<Boolean, byte[], byte[], String, List<String>, List<byte[]>> result =
                 registry.getOrganizationById(strToBytes32(orgId)).send();
             if (result.getValue1()) {
                 OrganizationRegistration.Builder builder = OrganizationRegistration.newBuilder()
@@ -64,7 +64,7 @@ public Optional<OrganizationRegistration> getOrganizationById(String orgId) {
     public Optional<ServiceRegistration> getServiceRegistrationById(String orgId, String serviceId) {
         return wrapExceptions(() -> {
             log.info("Get service from Registry, orgId: {}, serviceId: {}", orgId, serviceId);
-            Tuple4<Boolean, byte[], byte[], List<byte[]>> result = 
+            Tuple3<Boolean, byte[], byte[]> result = 
                 registry.getServiceRegistrationById(strToBytes32(orgId), strToBytes32(serviceId)).send();
             if (result.getValue1()) {
                 ServiceRegistration registration = ServiceRegistration.newBuilder()

sdk/src/main/java/io/singularitynet/sdk/registry/ServiceRegistration.java

@@ -3,16 +3,13 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import java.net.URI;
-import java.util.List;
-import java.util.ArrayList;
 
 @EqualsAndHashCode
 @ToString
 public class ServiceRegistration {
 
     private final String serviceId;
     private final URI metadataUri;
-    private final List<String> tags;
 
     public static Builder newBuilder() {
         return new Builder();
@@ -25,7 +22,6 @@ public Builder toBuilder() {
     private ServiceRegistration(Builder builder) {
         this.serviceId = builder.serviceId;
         this.metadataUri = builder.metadataUri;
-        this.tags = builder.tags;
     }
 
     public String getServiceId() {
@@ -36,23 +32,17 @@ public URI getMetadataUri() {
         return metadataUri;
     }
 
-    public List<String> getTags() {
-        return tags;
-    }
-
     public static class Builder {
 
         private String serviceId;
         private URI metadataUri;
-        private List<String> tags = new ArrayList<>();
 
         private Builder() {
         }
 
         private Builder(ServiceRegistration object) {
             this.serviceId = object.serviceId;
             this.metadataUri = object.metadataUri;
-            this.tags = object.tags;
         }
 
         public Builder setServiceId(String serviceId) {
@@ -65,11 +55,6 @@ public Builder setMetadataUri(URI metadataUri) {
             return this;
         }
 
-        public Builder addTag(String tag) {
-            this.tags.add(tag);
-            return this;
-        }
-
         public ServiceRegistration build() {
             return new ServiceRegistration(this);
         }

sdk/src/test/java/io/singularitynet/sdk/integration/Web3jTestIT.java

@@ -39,7 +39,7 @@ public void getServiceRegistrationById() throws Exception {
         Registry registry = Registry.load(IntEnv.REGISTRY_CONTRACT_ADDRESS.toString(), web3j,
                 roTransactionManager, gasProvider);
 
-        Tuple4<Boolean, byte[], byte[], List<byte[]>> result = 
+        Tuple3<Boolean, byte[], byte[]> result = 
             registry.getServiceRegistrationById(Utils.strToBytes32(IntEnv.TEST_ORG_ID),
                     Utils.strToBytes32(IntEnv.TEST_SERVICE_ID)).send();
 

sdk/src/test/java/io/singularitynet/sdk/registry/RegistryMock.java

@@ -23,10 +23,10 @@ public void addServiceRegistration(String orgId, String serviceId,
                     eq(Utils.strToBytes32(serviceId))))
             .thenReturn(new RemoteCall<>(
                         () -> {
-                            return new Tuple4<>(true,
+                            return new Tuple3<>(true,
                                     Utils.strToBytes32(registration.getServiceId()),
-                                    Utils.strToBytes(registration.getMetadataUri().toString()),
-                                    registration.getTags().stream().map(Utils::strToBytes32).collect(toList()));
+                                    Utils.strToBytes(registration.getMetadataUri().toString())
+                                    );
                         })
                     );
     }
@@ -36,13 +36,12 @@ public void addOrganizationRegistration(String orgId,
         when(registry.getOrganizationById(eq(Utils.strToBytes32(orgId))))
             .thenReturn(new RemoteCall<>(
                         () -> {
-                            return new Tuple7<>(true,
+                            return new Tuple6<>(true,
                                     Utils.strToBytes32(registration.getOrgId()),
                                     Utils.strToBytes(registration.getMetadataUri().toString()),
                                     "0xfA8a01E837c30a3DA3Ea862e6dB5C6232C9b800A",
                                     Collections.EMPTY_LIST,
-                                    registration.getServiceIds().stream().map(Utils::strToBytes32).collect(toList()),
-                                    Collections.EMPTY_LIST
+                                    registration.getServiceIds().stream().map(Utils::strToBytes32).collect(toList())
                                     );
                         })
                     );