Merge pull request #55 from iExecBlockchainComputing/bugfix/remove-dead-code

Remove dead code in `IexecHubAbstractService` and `Web3jbstractService`

Author: jbern0rd

CHANGELOG.md

@@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file.
 - Do not run tests in `itest` task to avoid executing them twice. (#47)
 - Upgrade to Gradle 8.2.1 with up-to-date plugins. (#49)
 - Fetch contribution deadline ratio during `@PostConstruct` execution in `IexecHubAbstractService`. (#51)
-- Remove dead code in `IexecHubAbstractService`. (#54)
+- Remove dead code in `IexecHubAbstractService` and `Web3jAbstractService`. (#54 #55)
 ### Dependency Upgrades
 - Upgrade to Spring Boot 2.7.14. (#48)
 - Upgrade to `testcontainers` 1.19.0. (#50)

src/main/java/com/iexec/commons/poco/chain/IexecHubAbstractService.java

@@ -1035,35 +1035,6 @@ public boolean hasEnoughGas(String address) {
         return web3jAbstractService.hasEnoughGas(address);
     }
 
-
-    protected boolean isStatusValidOnChainAfterPendingReceipt(String chainTaskId,
-                                                              ChainStatus onchainStatus,
-                                                              BiFunction<String, ChainStatus, Boolean> isStatusValidOnChainFunction) {
-        long maxWaitingTime = web3jAbstractService.getMaxWaitingTimeWhenPendingReceipt();
-        log.info("Waiting for on-chain status after pending receipt " +
-                        "[chainTaskId:{}, status:{}, maxWaitingTime:{}]",
-                chainTaskId, onchainStatus, maxWaitingTime);
-
-        final long startTime = System.currentTimeMillis();
-        long duration = 0;
-        while (duration < maxWaitingTime) {
-            try {
-                if (isStatusValidOnChainFunction.apply(chainTaskId, onchainStatus)) {
-                    return true;
-                }
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                log.error("Error in checking the latest block number", e);
-            }
-            duration = System.currentTimeMillis() - startTime;
-        }
-
-        log.error("Timeout reached after waiting for on-chain status " +
-                        "[chainTaskId:{}, maxWaitingTime:{}]",
-                chainTaskId, maxWaitingTime);
-        return false;
-    }
-
     /*
      * Behaves as a cache to avoid always calling blockchain to retrieve task description
      *

src/main/java/com/iexec/commons/poco/chain/Web3jAbstractService.java

@@ -181,28 +181,6 @@ public boolean isBlockAvailable(long blockNumber) {
         return false;
     }
 
-    public long getMaxWaitingTimeWhenPendingReceipt() {
-        long maxWaitingTime = 2 * 60 * 1000L; // 2min
-
-        // max waiting Time should be roughly the time of 10 blocks
-        try {
-            EthBlock.Block latestBlock = getLatestBlock();
-
-            long latestBlockNumber = latestBlock.getNumber().longValue();
-
-            BigInteger latestBlockTimestamp = latestBlock.getTimestamp();
-            BigInteger tenBlocksAgoTimestamp = getBlock(latestBlockNumber - 10).getTimestamp();
-
-            maxWaitingTime = (latestBlockTimestamp.longValue() - tenBlocksAgoTimestamp.longValue()) * 1000;
-
-            log.info("[latestBlockTimestamp:{}, tenBlocksAgoTimestamp:{}, maxWaitingTime:{}]",
-                    latestBlockTimestamp, tenBlocksAgoTimestamp, maxWaitingTime);
-        } catch (IOException e) {
-            log.error("Error when computing max waiting time", e);
-        }
-        return maxWaitingTime;
-    }
-
     public long getAverageTimePerBlock() {//in ms
         long defaultTime = TransactionManager.DEFAULT_POLLING_FREQUENCY; // 15sec
         int NB_OF_BLOCKS = 10;