Purge remaining usages V1 GRPC API. (#291)

* bump base.

* CHANGELOG

* Remove v1 usages.

* Remove unused imports.

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased changes
+ - Purge remaining usages of V1 GRPC API.
 
 ## 6.0.0
 - Added method `waitUntilFinalized` for waiting until a given transaction is finalized.

concordium-sdk/src/main/java/com/concordium/sdk/responses/peerlist/PeerCatchupStatus.java

@@ -1,8 +1,6 @@
 package com.concordium.sdk.responses.peerlist;
 
 import com.concordium.grpc.v2.PeersInfo;
-import concordium.ConcordiumP2PRpc;
-
 /**
  * Represents Catchup Status of a Node.
  */
@@ -34,27 +32,6 @@ public enum PeerCatchupStatus {
         this.value = value;
     }
 
-    /**
-     * Parses the input {@link ConcordiumP2PRpc.PeerElement.CatchupStatus}.
-     *
-     * @param catchupStatus input {@link ConcordiumP2PRpc.PeerElement.CatchupStatus}.
-     * @return Parsed {@link PeerCatchupStatus}.
-     */
-    public static PeerCatchupStatus parse(ConcordiumP2PRpc.PeerElement.CatchupStatus catchupStatus) {
-        switch (catchupStatus) {
-            case UPTODATE:
-                return PeerCatchupStatus.UP_TO_DATE;
-            case PENDING:
-                return PeerCatchupStatus.PENDING;
-            case CATCHINGUP:
-                return PeerCatchupStatus.CATCHING_UP;
-            default:
-                throw new IllegalArgumentException(String.format(
-                        "Invalid catchup status received: %d",
-                        catchupStatus.getNumber()));
-        }
-    }
-
     /**
      * Parses the input {@link com.concordium.grpc.v2.PeersInfo.Peer.CatchupStatus}.
      *

concordium-sdk/src/main/java/com/concordium/sdk/types/AccountAddress.java

@@ -1,19 +1,15 @@
 package com.concordium.sdk.types;
 
 import com.concordium.sdk.crypto.SHA256;
-import com.concordium.sdk.serializing.JsonMapper;
 import com.concordium.sdk.transactions.AccountType;
 import com.concordium.sdk.transactions.Base58;
 import com.concordium.sdk.transactions.CredentialRegistrationId;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.google.common.collect.ImmutableList;
-import concordium.ConcordiumP2PRpc;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.val;
@@ -23,7 +19,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Objects;
-import java.util.Optional;
 
 
 @EqualsAndHashCode(callSuper = true)
@@ -125,19 +120,6 @@ public static AccountAddress fromBytes(ByteBuffer source) {
         return AccountAddress.from(addressBytes);
     }
 
-    public static Optional<ImmutableList<AccountAddress>> toList(ConcordiumP2PRpc.JsonResponse res) {
-        try {
-            val array = JsonMapper.INSTANCE.readValue(res.getValue(), AccountAddress[].class);
-            if (Objects.isNull(array)) {
-                return Optional.empty();
-            }
-
-            return Optional.of(ImmutableList.copyOf(array));
-        } catch (JsonProcessingException e) {
-            throw new IllegalArgumentException("Cannot parse AccountInfo Array JSON", e);
-        }
-    }
-
     @JsonCreator
     AccountAddress(String encodedAddress) {
         super(AccountType.ADDRESS_ACCOUNT);

concordium-sdk/src/main/java/com/concordium/sdk/types/ContractAddress.java

@@ -9,14 +9,10 @@
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.google.common.collect.ImmutableList;
-import concordium.ConcordiumP2PRpc;
 import lombok.*;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.Objects;
-import java.util.Optional;
 
 @Getter
 @ToString
@@ -51,20 +47,6 @@ public String toJson() {
         }
     }
 
-    public static Optional<ImmutableList<ContractAddress>> toList(ConcordiumP2PRpc.JsonResponse res) {
-        try {
-            val array = JsonMapper.INSTANCE.readValue(res.getValue(), ContractAddress[].class);
-
-            if (Objects.isNull(array)) {
-                return Optional.empty();
-            }
-
-            return Optional.of(ImmutableList.copyOf(array));
-        } catch (JsonProcessingException e) {
-            throw new IllegalArgumentException("Cannot parse ContractAddress Array JSON", e);
-        }
-    }
-
     public static ContractAddress from(long index, long subIndex) {
         return ContractAddress.builder()
                 .index(index)