Remove dead code in IexecHubService and CommandStorage (#133)

Author: jbern0rd

CHANGELOG.md

@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 
 - Remove `/tasks/{chainTaskId}` endpoint, the adapter must only call `initialize` and `finalize` **PoCo** methods. (#130)
 - Remove `/broker/orders/match` endpoint, `matchOrders` must be done through the **Market API**. (#131)
+- Remove dead code in `IexecHubService` and `CommandStorage`. (#133)
 
 ## [[8.3.0]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.3.0) 2024-01-10
 

src/main/java/com/iexec/blockchain/command/generic/CommandStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import com.iexec.blockchain.api.CommandStatus;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 
 import java.time.Instant;
@@ -69,7 +68,6 @@ public boolean updateToReceived(A args) {
     public boolean updateToProcessing(String chainObjectId) {
         Optional<C> localCommand = commandRepository
                 .findByChainObjectId(chainObjectId)
-                .filter(command -> command.getStatus() != null)
                 .filter(command -> command.getStatus() == CommandStatus.RECEIVED);
         if (localCommand.isEmpty()) {
             return false;
@@ -93,27 +91,21 @@ public void updateToFinal(String chainObjectId,
                               @NonNull TransactionReceipt receipt) {
         Optional<C> localCommand = commandRepository
                 .findByChainObjectId(chainObjectId)
-                .filter(command -> command.getStatus() != null)
                 .filter(command -> command.getStatus() == CommandStatus.PROCESSING);
         if (localCommand.isEmpty()) {
             return;
         }
         C command = localCommand.get();
 
         CommandStatus status;
-        if (StringUtils.isNotEmpty(receipt.getStatus())
-                && receipt.getStatus().equals("0x1")) {
+        if (receipt.isStatusOK()) {
             status = CommandStatus.SUCCESS;
-            log.info("Success command with transaction receipt " +
-                            "[chainObjectId:{}, command:{}, receipt:{}]",
-                    chainObjectId,
-                    command.getClass().getSimpleName(),
-                    receipt);
+            log.info("Success command with transaction receipt [chainObjectId:{}, command:{}, receipt:{}]",
+                    chainObjectId, command.getClass().getSimpleName(), receipt);
         } else {
             status = CommandStatus.FAILURE;
-            log.info("Failure after transaction sent [chainObjectId:{}, " +
-                            "command:{}, receipt:{}]", chainObjectId,
-                    command.getClass().getSimpleName(), receipt);
+            log.info("Failure after transaction sent [chainObjectId:{}, command:{}, receipt:{}]",
+                    chainObjectId, command.getClass().getSimpleName(), receipt);
         }
         command.setStatus(status);
         command.setTransactionReceipt(receipt);

src/main/java/com/iexec/blockchain/tool/IexecHubService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,11 @@
 
 package com.iexec.blockchain.tool;
 
-import com.iexec.common.utils.EthAddress;
 import com.iexec.common.worker.result.ResultUtils;
-import com.iexec.commons.poco.chain.*;
+import com.iexec.commons.poco.chain.ChainDeal;
+import com.iexec.commons.poco.chain.ChainTask;
+import com.iexec.commons.poco.chain.ChainTaskStatus;
+import com.iexec.commons.poco.chain.IexecHubAbstractService;
 import com.iexec.commons.poco.utils.BytesUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -46,20 +48,11 @@ public IexecHubService(CredentialsService credentialsService,
         );
     }
 
-    public static boolean isSignature(String hexString) {
-        return !StringUtils.isEmpty(hexString) &&
-                BytesUtils.stringToBytes(hexString).length == 65; // 32 + 32 + 1
-    }
-
     public static boolean isByte32(String hexString) {
         return !StringUtils.isEmpty(hexString) &&
                 BytesUtils.stringToBytes(hexString).length == 32;
     }
 
-    public static boolean isAddress(String hexString) {
-        return EthAddress.validate(hexString);
-    }
-
     public TransactionReceipt initializeTask(String chainDealId,
                                              int taskIndex) throws Exception {
         addLatency();
@@ -200,22 +193,4 @@ public Date getContributionDeadline(ChainDeal chainDeal) {
         return new Date(startTime + maxTime * maxNbOfPeriods);
     }
 
-    public boolean hasEnoughStakeToContribute(String chainDealId, String workerWallet) {
-        Optional<ChainAccount> optionalChainAccount = getChainAccount(workerWallet);
-        Optional<ChainDeal> optionalChainDeal = getChainDeal(chainDealId);
-        if (optionalChainAccount.isEmpty() || optionalChainDeal.isEmpty()) {
-            return false;
-        }
-        return optionalChainAccount.get().getDeposit() >= optionalChainDeal.get().getWorkerStake().longValue();
-    }
-
-    public boolean isContributionUnsetToContribute(String chainTaskId, String workerWallet) {
-        Optional<ChainContribution> optionalContribution =
-                getChainContribution(chainTaskId, workerWallet);
-        if (optionalContribution.isEmpty()) return false;
-
-        ChainContribution chainContribution = optionalContribution.get();
-        return chainContribution.getStatus().equals(ChainContributionStatus.UNSET);
-    }
-
 }

src/test/java/com/iexec/blockchain/command/task/initialize/TaskInitializeStorageTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2021-2024 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,7 +117,7 @@ void shouldNotSetProcessingSinceBadStatus() {
     @Test
     void shouldSetFinalSuccess() {
         TransactionReceipt receipt = mock(TransactionReceipt.class);
-        when(receipt.getStatus()).thenReturn("0x1");
+        when(receipt.isStatusOK()).thenReturn(true);
         TaskInitialize taskInitialize = new TaskInitialize();
         taskInitialize.setStatus(CommandStatus.PROCESSING);
         when(repository.findByChainObjectId(CHAIN_TASK_ID))
@@ -138,7 +138,7 @@ void shouldSetFinalSuccess() {
     @Test
     void shouldSetFinalFailure() {
         TransactionReceipt receipt = mock(TransactionReceipt.class);
-        when(receipt.getStatus()).thenReturn("0x0");
+        when(receipt.isStatusOK()).thenReturn(false);
         TaskInitialize taskInitialize = new TaskInitialize();
         taskInitialize.setStatus(CommandStatus.PROCESSING);
         when(repository.findByChainObjectId(CHAIN_TASK_ID))