fix: upgrade to commons-poco 5.3.1 for latest eth_call fix (#184)

Author: jbern0rd

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
 
   ibaa-chain:
-    image: docker-regis.iex.ec/poco-chain:1.0.0-poco-v5.5.0-voucher-v1.0.0-nethermind
+    image: docker-regis.iex.ec/poco-chain:1.1.0-poco-v6.1.0-contracts-voucher-v1.0.0-nethermind
     expose:
       - "8545"
 

gradle.properties

@@ -1,8 +1,8 @@
 # x-release-please-start-version
 version=9.0.2
 # x-release-please-end
-iexecCommonsPocoVersion=5.1.0
-iexecCommonVersion=9.1.0
+iexecCommonsPocoVersion=5.3.1
+iexecCommonVersion=9.2.0
 
 nexusUser
 nexusPassword

src/test/java/com/iexec/blockchain/chain/IexecHubServiceTests.java

@@ -29,13 +29,13 @@
 import org.web3j.crypto.Keys;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 import org.web3j.protocol.exceptions.TransactionException;
-import org.web3j.tx.RawTransactionManager;
 import org.web3j.tx.response.PollingTransactionReceiptProcessor;
 
 import java.io.IOException;
 import java.math.BigInteger;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.Map;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -59,8 +59,6 @@ class IexecHubServiceTests {
     @Mock
     private PollingTransactionReceiptProcessor txReceiptProcessor;
     @Mock
-    private RawTransactionManager txManager;
-    @Mock
     private Web3jService web3jService;
     @Mock
     private TransactionReceipt receipt;
@@ -72,7 +70,6 @@ void init() {
         when(signerService.getCredentials()).thenReturn(credentials);
         iexecHubService = spy(new IexecHubService(signerService, web3jService, chainConfig));
         ReflectionTestUtils.setField(iexecHubService, "txReceiptProcessor", txReceiptProcessor);
-        ReflectionTestUtils.setField(iexecHubService, "txManager", txManager);
     }
 
     @SneakyThrows
@@ -130,15 +127,15 @@ void shouldNotReveal() throws IOException {
     @Test
     void shouldFinalizeTask() throws IOException, TransactionException {
         mockTransaction();
-        when(txManager.sendCall(any(), any(), any())).thenReturn("0x30D40"); // hexadecimal value for 200_000
+        when(web3jService.sendCall(any(), any(), any())).thenReturn("0x30D40"); // hexadecimal value for 200_000
         assertThat(iexecHubService.finalizeTask(chainTaskId, "resultLink", "callbackData"))
                 .isEqualTo(receipt);
     }
 
     @Test
     void shouldNotFinalizeTask() throws IOException {
         when(signerService.estimateGas(any(), any())).thenReturn(BigInteger.valueOf(100_000L));
-        when(txManager.sendCall(any(), any(), any())).thenReturn("0x30D40"); // hexadecimal value for 200_000
+        when(web3jService.sendCall(any(), any(), any())).thenReturn("0x30D40"); // hexadecimal value for 200_000
         when(signerService.signAndSendTransaction(any(), any(), any(), any(), any()))
                 .thenThrow(IOException.class);
         assertThatThrownBy(() -> iexecHubService.finalizeTask(chainTaskId, "resultLink", "callbackData"))
@@ -176,9 +173,10 @@ void shouldNotBeBeforeContributionDeadline() {
     @Test
     void shouldBeBeforeContributionDeadline() {
         final BigInteger startTime = BigInteger.valueOf(Instant.now().getEpochSecond());
-        final ChainCategory category = ChainCategory.builder().id(0).maxExecutionTime(1000L).build();
-        doReturn(Optional.of(ChainDeal.builder().chainCategory(category).startTime(startTime).build()))
-                .when(iexecHubService).getChainDeal("dealId");
+        final ChainCategory category = ChainCategory.builder().maxExecutionTime(1000L).build();
+        ReflectionTestUtils.setField(iexecHubService, "categories", Map.of(0L, category));
+        when(iexecHubService.getChainDeal("dealId"))
+                .thenReturn(Optional.of(ChainDeal.builder().chainCategory(category).startTime(startTime).build()));
         assertThat(iexecHubService.isBeforeContributionDeadline("dealId"))
                 .isTrue();
     }