From 9220fb33584d09a5d22456a71cc40713ade7b333 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Tue, 18 Apr 2023 10:01:11 +0200 Subject: [PATCH 1/2] Remove unused methods in `IexecHubService` --- .../com/iexec/core/chain/IexecHubService.java | 147 ------------------ 1 file changed, 147 deletions(-) diff --git a/src/main/java/com/iexec/core/chain/IexecHubService.java b/src/main/java/com/iexec/core/chain/IexecHubService.java index 04f9072c..d9978bb5 100644 --- a/src/main/java/com/iexec/core/chain/IexecHubService.java +++ b/src/main/java/com/iexec/core/chain/IexecHubService.java @@ -18,19 +18,12 @@ import com.iexec.commons.poco.chain.*; import com.iexec.commons.poco.contract.generated.IexecHubContract; -import com.iexec.commons.poco.utils.BytesUtils; import io.reactivex.Flowable; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.tuple.Pair; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.web3j.protocol.core.RemoteCall; import org.web3j.protocol.core.methods.request.EthFilter; -import org.web3j.protocol.core.methods.response.BaseEventResponse; import org.web3j.protocol.core.methods.response.TransactionReceipt; -import java.math.BigInteger; -import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.List; import java.util.Optional; @@ -40,8 +33,6 @@ import java.util.concurrent.ThreadPoolExecutor; import static com.iexec.common.utils.DateTimeUtils.now; -import static com.iexec.commons.poco.chain.ChainTaskStatus.ACTIVE; -import static com.iexec.commons.poco.chain.ChainTaskStatus.COMPLETED; import static com.iexec.commons.poco.utils.BytesUtils.stringToBytes; @Slf4j @@ -52,7 +43,6 @@ public class IexecHubService extends IexecHubAbstractService { private final CredentialsService credentialsService; private final Web3jService web3jService; - @Autowired public IexecHubService(CredentialsService credentialsService, Web3jService web3jService, ChainConfig chainConfig) { @@ -68,22 +58,6 @@ public IexecHubService(CredentialsService credentialsService, } } - /** - * Check if a deal's task can be initialized. - * An initializable task should have the status - * UNSET onchain and have a contribution deadline - * that is still in the future. - * - * @param chainDealId - * @param taskIndex - * @return true if the task is initializable, false otherwise. - */ - public boolean isInitializableOnchain(String chainDealId, int taskIndex) { - boolean isTaskUnsetOnChain = isTaskInUnsetStatusOnChain(chainDealId, taskIndex); - boolean isBeforeContributionDeadline = isBeforeContributionDeadline(chainDealId); - return isBeforeContributionDeadline && isTaskUnsetOnChain; - } - /** * Check if the task is defined onchain and * has the status {@link ChainTaskStatus#UNSET}. @@ -167,52 +141,6 @@ public Date getChainDealFinalDeadline(ChainDeal chainDeal) { return new Date(startTime + maxTime * 10); } - @Deprecated - public Optional> initialize(String chainDealId, int taskIndex) { - log.info("Requested initialize [chainDealId:{}, taskIndex:{}, waitingTxCount:{}]", chainDealId, taskIndex, getWaitingTransactionCount()); - try { - return CompletableFuture.supplyAsync(() -> sendInitializeTransaction(chainDealId, taskIndex), executor).get(); - } catch (InterruptedException | ExecutionException e) { - log.error("initialize asynchronous execution did not complete", e); - } - return Optional.empty(); - } - - private Optional> sendInitializeTransaction(String chainDealId, int taskIndex) { - byte[] chainDealIdBytes = stringToBytes(chainDealId); - String computedChainTaskId = ChainUtils.generateChainTaskId(chainDealId, taskIndex); - RemoteCall initializeCall = - getHubContract(web3jService.getWritingContractGasProvider()) - .initialize(chainDealIdBytes, BigInteger.valueOf(taskIndex)); - - TransactionReceipt initializeReceipt; - try { - initializeReceipt = initializeCall.send(); - } catch (Exception e) { - log.error("Failed to send initialize [chainDealId:{}, taskIndex:{}]", chainDealId, taskIndex, e); - return Optional.empty(); - } - - List initializeEvents = getHubContract().getTaskInitializeEvents(initializeReceipt); - - IexecHubContract.TaskInitializeEventResponse initializeEvent = null; - if (initializeEvents != null && !initializeEvents.isEmpty()) { - initializeEvent = initializeEvents.get(0); - } - - if (isSuccessTx(computedChainTaskId, initializeEvent, ACTIVE)) { - String chainTaskId = BytesUtils.bytesToString(initializeEvent.taskid); - ChainReceipt chainReceipt = buildChainReceipt(initializeReceipt); - log.info("Initialized [chainTaskId:{}, chainDealId:{}, taskIndex:{}, gasUsed:{}, block:{}]", - computedChainTaskId, chainDealId, taskIndex, - initializeReceipt.getGasUsed(), chainReceipt.getBlockNumber()); - return Optional.of(Pair.of(chainTaskId, chainReceipt)); - } - - log.error("Failed to initialize [chainDealId:{}, taskIndex:{}]", chainDealId, taskIndex); - return Optional.empty(); - } - public boolean canFinalize(String chainTaskId) { Optional optional = getChainTask(chainTaskId); if (optional.isEmpty()) { @@ -236,73 +164,6 @@ public boolean canFinalize(String chainTaskId) { return ret; } - public Optional finalizeTask(String chainTaskId, String resultLink, String callbackData) { - log.info("Requested finalize [chainTaskId:{}, waitingTxCount:{}]", chainTaskId, getWaitingTransactionCount()); - try { - return CompletableFuture.supplyAsync(() -> sendFinalizeTransaction(chainTaskId, resultLink, callbackData), executor).get(); - } catch (InterruptedException | ExecutionException e) { - log.error("finalizeTask asynchronous execution did not complete", e); - } - return Optional.empty(); - } - - private Optional sendFinalizeTransaction(String chainTaskId, String resultLink, String callbackData) { - byte[] chainTaskIdBytes = stringToBytes(chainTaskId); - byte[] results = new byte[0]; - byte[] resultsCallback = new byte[0]; - - boolean shouldSendCallback = callbackData != null && !callbackData.isEmpty(); - if (!shouldSendCallback) { - results = resultLink.getBytes(StandardCharsets.UTF_8); - } else { - resultsCallback = stringToBytes(callbackData); - } - - TransactionReceipt finalizeReceipt; - - RemoteCall finalizeCall = getHubContract(web3jService.getWritingContractGasProvider()) - .finalize(chainTaskIdBytes, results, resultsCallback); - - try { - finalizeReceipt = finalizeCall.send(); - } catch (Exception e) { - log.error("Failed to send finalize [chainTaskId:{}, resultLink:{}, callbackData:{}, shouldSendCallback:{}]", - chainTaskId, resultLink, callbackData, shouldSendCallback, e); - return Optional.empty(); - } - - List finalizeEvents = getHubContract().getTaskFinalizeEvents(finalizeReceipt); - - IexecHubContract.TaskFinalizeEventResponse finalizeEvent = null; - if (finalizeEvents != null && !finalizeEvents.isEmpty()) { - finalizeEvent = finalizeEvents.get(0); - } - - if (isSuccessTx(chainTaskId, finalizeEvent, COMPLETED)) { - ChainReceipt chainReceipt = buildChainReceipt(finalizeReceipt); - log.info("Finalized [chainTaskId:{}, resultLink:{}, callbackData:{}, " + - "shouldSendCallback:{}, gasUsed:{}, block:{}]", - chainTaskId, resultLink, callbackData, shouldSendCallback, - finalizeReceipt.getGasUsed(), chainReceipt.getBlockNumber()); - return Optional.of(chainReceipt); - } - - log.error("Failed to finalize [chainTaskId:{}]", chainTaskId); - return Optional.empty(); - } - - private boolean isSuccessTx(String chainTaskId, BaseEventResponse txEvent, ChainTaskStatus pretendedStatus) { - if (txEvent == null || txEvent.log == null) { - return false; - } - - if (txEvent.log.getType() == null || txEvent.log.getType().equals(PENDING_RECEIPT_STATUS)) { - return isStatusValidOnChainAfterPendingReceipt(chainTaskId, pretendedStatus, this::isTaskStatusValidOnChain); - } - - return true; - } - public boolean canReopen(String chainTaskId) { Optional optional = getChainTask(chainTaskId); if (optional.isEmpty()) { @@ -371,14 +232,6 @@ public boolean hasEnoughGas() { return hasEnoughGas(credentialsService.getCredentials().getAddress()); } - private Boolean isTaskStatusValidOnChain(String chainTaskId, ChainStatus chainTaskStatus) { - if (chainTaskStatus instanceof ChainTaskStatus) { - Optional optionalChainTask = getChainTask(chainTaskId); - return optionalChainTask.isPresent() && optionalChainTask.get().getStatus().equals(chainTaskStatus); - } - return false; - } - private ChainReceipt buildChainReceipt(TransactionReceipt receipt) { return ChainReceipt.builder() .txHash(receipt.getTransactionHash()) From 1ce18a7ef73ca59932dc7fc70f8b45ac00860482 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Tue, 18 Apr 2023 10:14:45 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfa277e4..19c4b4af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. ### Bug Fixes - Prevent race condition on replicate update. (#568) ### Quality +- Remove unused methods in `IexecHubService`. (#572) ### Dependency Upgrades - Upgrade to `iexec-common` 8.0.0. (#571) - Add new `iexec-commons-poco` 1.0.2 dependency. (#571)