Replace CredentialsService with SignerService (#264)

Author: jbern0rd

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-sms/releases/tag/vNEXT) 2024
 
+### New Features
+
+- Replace `CredentialsService` with `SignerService`. (#264)
+
 ### Quality
 
 - Configure Gradle JVM Test Suite Plugin. (#259)

gradle.properties

@@ -1,6 +1,6 @@
 version=8.5.1
 iexecCommonVersion=8.4.0
-iexecCommonsPocoVersion=3.2.0
+iexecCommonsPocoVersion=4.0.0-NEXT-SNAPSHOT
 
 nexusUser
 nexusPassword

src/main/java/com/iexec/sms/blockchain/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,20 +16,19 @@
 
 package com.iexec.sms.blockchain;
 
-
 import com.iexec.commons.poco.chain.IexecHubAbstractService;
+import com.iexec.commons.poco.chain.SignerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 @Service
 public class IexecHubService extends IexecHubAbstractService {
 
     @Autowired
-    public IexecHubService(CredentialsService credentialsService,
+    public IexecHubService(SignerService signerService,
                            Web3jService web3jService,
                            BlockchainConfig blockchainConfig) {
-        super(credentialsService.getCredentials(), web3jService, blockchainConfig.getHubAddress());
+        super(signerService.getCredentials(), web3jService, blockchainConfig.getHubAddress());
     }
 
 }

…c/sms/blockchain/CredentialsService.java …/sms/blockchain/WalletConfiguration.javasrc/main/java/com/iexec/sms/blockchain/CredentialsService.java renamed to src/main/java/com/iexec/sms/blockchain/WalletConfiguration.java src/main/java/com/iexec/sms/blockchain/CredentialsService.java renamed to src/main/java/com/iexec/sms/blockchain/WalletConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 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,14 +16,16 @@
 
 package com.iexec.sms.blockchain;
 
-import com.iexec.common.chain.CredentialsAbstractService;
+import com.iexec.commons.poco.chain.SignerService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
-import org.springframework.stereotype.Service;
+import java.security.GeneralSecurityException;
 
-@Service
-public class CredentialsService extends CredentialsAbstractService {
-
-    public CredentialsService() throws Exception {
-        super();
+@Configuration
+public class WalletConfiguration {
+    @Bean
+    SignerService signerService(Web3jService web3jService, BlockchainConfig chainConfig) throws GeneralSecurityException {
+        return new SignerService(web3jService.getWeb3j(), chainConfig.getId());
     }
 }

src/test/java/com/iexec/sms/blockchain/WalletConfigurationTest.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.iexec.sms.blockchain;
+
+import com.iexec.commons.poco.chain.SignerService;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.context.annotation.UserConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class WalletConfigurationTest {
+    private final ApplicationContextRunner runner = new ApplicationContextRunner();
+
+    @Test
+    void shouldCreateBeans() {
+        runner.withBean(BlockchainConfig.class, 65535, true, "http://localhost:8545", "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca", Duration.ofSeconds(5L), 1.0f, 0L)
+                .withBean(IexecHubService.class)
+                .withBean(Web3jService.class)
+                .withConfiguration(UserConfigurations.of(WalletConfiguration.class))
+                .run(context -> assertThat(context)
+                        .hasSingleBean(BlockchainConfig.class)
+                        .hasSingleBean(IexecHubService.class)
+                        .hasSingleBean(SignerService.class)
+                        .hasSingleBean(WalletConfiguration.class)
+                        .hasSingleBean(Web3jService.class));
+    }
+}