Cleanup and fix tests.

Concordium · Sep 21, 2023 · a398ef3 · a398ef3
1 parent 60d5611
commit a398ef3
Show file tree

Hide file tree

Showing 34 changed files with 182 additions and 231 deletions.
diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/ClientV2MapperExtensions.java b/concordium-sdk/src/main/java/com/concordium/sdk/ClientV2MapperExtensions.java
@@ -75,8 +75,8 @@
 import com.concordium.sdk.transactions.Signature;
 import com.concordium.sdk.transactions.TransferPayload;
 import com.concordium.sdk.transactions.TransferWithMemoPayload;
-import com.concordium.sdk.transactions.UpdateContractPayload;
 import com.concordium.sdk.transactions.*;
+import com.concordium.sdk.transactions.UpdateContract;
 import com.concordium.sdk.transactions.smartcontracts.WasmModule;
 import com.concordium.sdk.transactions.smartcontracts.WasmModuleVersion;
 import com.concordium.sdk.types.Timestamp;
@@ -644,7 +644,8 @@ static AccountTransaction to(com.concordium.grpc.v2.AccountTransaction transacti
                         .builderBlockItem()
                         .header(to(transaction.getHeader(), deployModulePayload.getBytes().length))
                         .signature(to(transaction.getSignature()))
-                        .payload(deployModulePayload)
+                        .payload(DeployModule.builder().module(deployModulePayload).build())
+                        .maxEnergyCost(UInt64.from(transaction.getHeader().getEnergyAmount().getValue()))
                         .build();
             }
             case INIT_CONTRACT: {
@@ -653,10 +654,11 @@ static AccountTransaction to(com.concordium.grpc.v2.AccountTransaction transacti
                         .header(to(transaction.getHeader(), initContractPayload.getBytes().length))
                         .signature(to(transaction.getSignature()))
                         .payload(initContractPayload)
+                        .maxEnergyCost(UInt64.from(transaction.getHeader().getEnergyAmount().getValue()))
                         .build();
             }
             case UPDATE_CONTRACT:
-                final UpdateContractPayload updateContractPayload = to(payload.getUpdateContract());
+                final UpdateContract updateContractPayload = to(payload.getUpdateContract());
                 return UpdateContractTransaction.builderAccountTransactionBlockItem()
                         .header(to(transaction.getHeader(), updateContractPayload.getRawPayloadBytes().length))
                         .signature(to(transaction.getSignature()))
@@ -719,8 +721,8 @@ static Data to(RegisteredData registerData) {
         return Data.from(registerData.getValue().toByteArray());
     }
 
-    static UpdateContractPayload to(com.concordium.grpc.v2.UpdateContractPayload updateContract) {
-        return UpdateContractPayload.from(
+    static UpdateContract to(com.concordium.grpc.v2.UpdateContractPayload updateContract) {
+        return UpdateContract.from(
                 to(updateContract.getAmount()),
                 to(updateContract.getAddress()),
                 ReceiveName.parse(updateContract.getReceiveName().getValue()),
@@ -871,7 +873,7 @@ static SendBlockItemRequest to(AccountTransaction accountTransaction) {
                 .setAccountTransaction(com.concordium.grpc.v2.AccountTransaction.newBuilder()
                         .setHeader(to(accountTransaction.getHeader()))
                         .setPayload(AccountTransactionPayload.newBuilder()
-                                .setRawPayload(ByteString.copyFrom(accountTransaction.getPayload().getRawPayloadBytes()))
+                                .setRawPayload(ByteString.copyFrom(accountTransaction.getPayload().getBytes()))
                                 .build())
                         .setSignature(to(accountTransaction.getSignature()))
                         .build())

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/AccountTransaction.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/AccountTransaction.java
@@ -25,6 +25,14 @@ public class AccountTransaction extends BlockItem {
      */
     private final Payload payload;
 
+    /**
+     * Constructor serializing an account transaction
+     * @param sender sender of the transaction
+     * @param nonce account nonce
+     * @param expiry the expiry of the transaction
+     * @param signer the {@link Signer} of the transaction
+     * @param payload the payload of the transaction
+     */
     AccountTransaction(
             @NonNull final AccountAddress sender,
             @NonNull final AccountNonce nonce,
@@ -40,6 +48,12 @@ public class AccountTransaction extends BlockItem {
                 .signWith(signer));
     }
 
+    /**
+     * Constructor for deserializing a transaction
+     * @param signature the signature
+     * @param header the header
+     * @param payload the payload
+     */
     public AccountTransaction(
             @NonNull final TransactionSignature signature,
             @NonNull final TransactionHeader header,

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureBaker.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureBaker.java
@@ -40,7 +40,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return payload.getBytes();
     }
 

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureDelegation.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureDelegation.java
@@ -33,7 +33,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return payload.getBytes();
     }
 

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/DeployModule.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/DeployModule.java
@@ -3,33 +3,34 @@
 import com.concordium.sdk.transactions.smartcontracts.WasmModule;
 import com.concordium.sdk.types.UInt64;
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
+@EqualsAndHashCode(callSuper = true)
 public class DeployModule extends Payload {
     /**
      * A compiled Smart Contract Module in WASM with source and version.
      */
     private final WasmModule module;
 
-    private final UInt64 maxEnergyCost;
+    private UInt64 maxEnergyCost;
 
-    private DeployModule(@NonNull final WasmModule module, @NonNull final UInt64 maxEnergyCost) {
+
+    private DeployModule(@NonNull final WasmModule module) {
         this.module = module;
-        this.maxEnergyCost = maxEnergyCost;
     }
 
     /**
      * It creates a new instance of the DeployModule class.
      *
      * @param module        The module to be deployed.
-     * @param maxEnergyCost The maximum amount of energy that can be consumed by the contract.
      * @return A new DeployModule object.
      */
     @Builder
-    static DeployModule createNew(final WasmModule module, final UInt64 maxEnergyCost) {
-        return new DeployModule(module, maxEnergyCost);
+    static DeployModule createNew(final WasmModule module) {
+        return new DeployModule(module);
     }
 
     @Override
@@ -43,7 +44,12 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return module.getBytes();
     }
+
+    public DeployModule withMaxEnergyCost(UInt64 maxEnergyCost) {
+        this.maxEnergyCost = maxEnergyCost;
+        return this;
+    }
 }
diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/DeployModuleTransaction.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/DeployModuleTransaction.java
@@ -20,15 +20,15 @@ private DeployModuleTransaction(
             @NonNull final TransactionSigner signer,
             @NonNull final WasmModule module,
             @NonNull final UInt64 maxEnergyCost) {
-        super(sender, nonce, expiry, signer, DeployModule.createNew(module, maxEnergyCost));
+        super(sender, nonce, expiry, signer, DeployModule.createNew(module).withMaxEnergyCost(maxEnergyCost));
     }
 
     private DeployModuleTransaction(
             final @NonNull TransactionHeader header,
             final @NonNull TransactionSignature signature,
-            final @NonNull WasmModule payload,
+            final @NonNull DeployModule payload,
             final @NonNull UInt64 maxEnergyCost) {
-        super(header, signature, DeployModule.createNew(payload, maxEnergyCost));
+        super(header, signature, payload.withMaxEnergyCost(maxEnergyCost));
     }
 
     /**
@@ -71,7 +71,7 @@ public static DeployModuleTransaction from(final AccountAddress sender,
     static DeployModuleTransaction from(
             final TransactionHeader header,
             final TransactionSignature signature,
-            final WasmModule payload,
+            final DeployModule payload,
             final UInt64 maxEnergyCost) {
         try {
             return new DeployModuleTransaction(header, signature, payload, maxEnergyCost);

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransfer.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransfer.java
@@ -41,7 +41,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         val toAddress = receiver.getBytes();
         byte[] dataBytes = data.getBytes();
         val buffer = ByteBuffer.allocate(toAddress.length + dataBytes.length);

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemo.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemo.java
@@ -28,7 +28,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return payload.getBytes();
     }
 

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/InitContract.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/InitContract.java
@@ -41,7 +41,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return payload.getBytes();
     }
 }
diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/InitName.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/InitName.java
@@ -2,6 +2,7 @@
 
 import com.concordium.sdk.types.UInt16;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.val;
@@ -16,6 +17,7 @@
  */
 @Getter
 @ToString
+@EqualsAndHashCode
 public final class InitName {
     /**
      * Name of the contract

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Parameter.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Parameter.java
@@ -2,6 +2,7 @@
 
 import com.concordium.sdk.types.UInt16;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.val;
@@ -18,6 +19,7 @@
 
 @Getter
 @ToString
+@EqualsAndHashCode
 public final class Parameter {
     public static final Parameter EMPTY = Parameter.from(new byte[0]);
     private final byte[] bytes;

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Payload.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Payload.java
@@ -34,11 +34,13 @@ public boolean equals(Object obj) {
     }
 
     /**
-     * Get the bytes representation of the payload
+     * Get the serialized payload.
+     * The actual payload is prepended with a tag (a byte) which
+     * indicates the {@link TransactionType}
      *
-     * @return byte[]
+     * @return the serialized payload (including the type tag).
      */
-    final byte[] getBytes() {
+    public final byte[] getBytes() {
         val payloadBytes = getRawPayloadBytes();
         val buffer = ByteBuffer.allocate(TransactionType.BYTES + payloadBytes.length);
         buffer.put(getTransactionType().getValue());
@@ -114,6 +116,11 @@ private static UInt64 calculateEnergyCost(int noOfSignatures,
 
     public abstract TransactionType getTransactionType();
 
-    public abstract byte[] getRawPayloadBytes();
+    /**
+     * This must return the raw payload i.e., the
+     * payload only. The tag will be prepended by {@link Payload#getBytes()}
+     * @return the raw serialized payload.
+     */
+    protected abstract byte[] getRawPayloadBytes();
 
 }
diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RawPayload.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RawPayload.java
@@ -8,7 +8,7 @@
 import java.util.Arrays;
 
 @ToString
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 public class RawPayload extends Payload {
 
     /**

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ReceiveName.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ReceiveName.java
@@ -2,6 +2,7 @@
 
 import com.concordium.sdk.types.UInt16;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.val;
@@ -16,6 +17,7 @@
 
 @Getter
 @ToString
+@EqualsAndHashCode
 public final class ReceiveName {
     /**
      * The name of the contract.

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RegisterData.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RegisterData.java
@@ -39,7 +39,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return data.getBytes();
     }
 

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Transfer.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Transfer.java
@@ -37,7 +37,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return payload.getBytes();
     }
 

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferSchedule.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferSchedule.java
@@ -45,7 +45,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         val scheduleLen = amount.length;
         val scheduleBufferSize = UInt64.BYTES * scheduleLen * 2;
 

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferScheduleWithMemo.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferScheduleWithMemo.java
@@ -51,7 +51,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         val schedule_len = amount.length;
         val schedule_buffer_size = UInt64.BYTES * schedule_len * 2;
         val buffer = ByteBuffer.allocate(

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncrypted.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncrypted.java
@@ -35,7 +35,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return amount.getBytes();
     }
 

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToPublic.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToPublic.java
@@ -49,7 +49,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         val proofBytes = this.proof.getBytes();
         val remainingAmountBytes = this.remainingAmount.getBytes();
         val buffer = ByteBuffer.allocate(remainingAmountBytes.length

diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferWithMemo.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferWithMemo.java
@@ -44,7 +44,7 @@ public TransactionType getTransactionType() {
     }
 
     @Override
-    public byte[] getRawPayloadBytes() {
+    protected byte[] getRawPayloadBytes() {
         return payload.getBytes();
     }
 }