Merge pull request #617 from iExecBlockchainComputing/feature/bump-iexec-common-libraries

Feature/bump iexec common libraries

Author: jbern0rd

CHANGELOG.md

@@ -26,6 +26,8 @@ All notable changes to this project will be documented in this file.
 - Upgrade to Spring Dependency Management Plugin 1.1.3. (#611)
 - Upgrade to `testcontainers` 1.19.0. (#613)
 - Upgrade to `jenkins-library` 2.7.3. (#615)
+- Upgrade to `iexec-commons-poco` 3.1.0. (#617)
+- Upgrade to `iexec-common` 8.3.0. (#617)
 
 ## [[8.1.2]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.1.2) 2023-06-29
 

gradle.properties

@@ -1,6 +1,6 @@
 version=8.1.2
-iexecCommonVersion=8.2.1
-iexecCommonsPocoVersion=3.0.5
+iexecCommonVersion=8.3.0
+iexecCommonsPocoVersion=3.1.0
 iexecBlockchainAdapterVersion=8.1.1
 iexecResultVersion=8.1.1
 iexecSmsVersion=8.1.1

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

@@ -11,17 +11,12 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.web3j.crypto.Credentials;
 import org.web3j.crypto.Keys;
-import org.web3j.protocol.core.RemoteFunctionCall;
 import org.web3j.protocol.core.methods.response.Log;
-import org.web3j.tx.TransactionManager;
 
-import java.math.BigInteger;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.stream.Stream;
@@ -57,15 +52,7 @@ void init() throws Exception {
         when(web3jService.hasEnoughGas(any())).thenReturn(true);
         when(chainConfig.getHubAddress()).thenReturn("0x748e091bf16048cb5103E0E10F9D5a8b7fBDd860");
 
-        try (MockedStatic<IexecHubContract> iexecHubContract = Mockito.mockStatic(IexecHubContract.class)) {
-            final IexecHubContract mockIexecContract = mock(IexecHubContract.class);
-            final RemoteFunctionCall<BigInteger> mockRemoteFunctionCall = mock(RemoteFunctionCall.class);
-            iexecHubContract.when(() -> IexecHubContract.load(any(), any(), (TransactionManager) any(), any()))
-                    .thenReturn(mockIexecContract);
-            when(mockIexecContract.contribution_deadline_ratio()).thenReturn(mockRemoteFunctionCall);
-            when(mockRemoteFunctionCall.send()).thenReturn(BigInteger.ONE);
-            iexecHubService = spy(new IexecHubService(credentialsService, web3jService, chainConfig));
-        }
+        iexecHubService = spy(new IexecHubService(credentialsService, web3jService, chainConfig));
     }