Merge pull request #101 from OpenFuturePlatform/key-master-fix

Update Wallet Api State Request Test Fix

Author: borbuevbeksultan

src/main/kotlin/io/openfuture/api/service/DefaultApplicationWalletService.kt

@@ -26,7 +26,7 @@ class DefaultApplicationWalletService(
         val keyWalletDto = keyApi.generateWallet(CreateKeyRequest(request.applicationId, user.id.toString(), request.blockchainType))
 
         // Save webhook on open state
-        //stateApi.createWallet(keyWalletDto.address, request.webHook, Blockchain.getBlockchainBySymbol(request.blockchainType.getValue()))
+        stateApi.createWallet(keyWalletDto.address, request.webHook, Blockchain.getBlockchainBySymbol(request.blockchainType.getValue()), request.applicationId)
 
         return keyWalletDto
     }
@@ -43,7 +43,7 @@ class DefaultApplicationWalletService(
         // Delete from Open Key
         keyApi.deleteAllWalletsByApplicationAddress(applicationId, address)
         // Delete from Open State
-        //stateApi.deleteWallet(address, Blockchain.Ethereum)
+        stateApi.deleteWallet(address, Blockchain.Ethereum)
     }
 
     override fun getAddressTransactionsByAddress(address: String): StateWalletTransactionDetail {

src/test/kotlin/io/openfuture/api/component/state/DefaultStateApiTests.kt

@@ -14,6 +14,7 @@ import org.springframework.http.ResponseEntity
 import org.springframework.web.client.RestTemplate
 import java.math.BigDecimal
 import java.time.LocalDateTime
+import java.util.*
 
 class DefaultStateApiTests : UnitTest() {
 
@@ -29,27 +30,16 @@ class DefaultStateApiTests : UnitTest() {
 
     @Test
     fun createWalletTest() {
-        val request = CreateStateWalletRequestMetadata(
+        val request = CreateStateWalletRequest(
+            "address",
             "webhook",
-            "applicationId",
-            listOf(KeyWalletDto("address", Blockchain.Ethereum.getValue(), "CUSTODIAL")),
-            WalletMetaData(
-                "0",
-                "op_UxQr1LLdREboF",
-                "USD",
-                "open",
-                false,
-                false
-            )
-        )
-        val response = CreateStateWalletResponse(
-            "webhook",
-            "op_UxQr1LLdREboF",
-            BigDecimal.ZERO,
-            listOf(WalletCreateResponse(Blockchain.Ethereum.getValue(),"address", BigDecimal.ZERO))
+            Blockchain.Ethereum.getValue(),
+            "applicationId"
         )
+        val response = StateWalletDto(
+            UUID.randomUUID().toString(), "address", "webhook", Blockchain.Ethereum, LocalDateTime.now())
 
-        given(restTemplate.postForEntity("/wallets", request, CreateStateWalletResponse::class.java)).willReturn(ResponseEntity(response, HttpStatus.OK))
+        given(restTemplate.postForEntity("/wallets/single", request, StateWalletDto::class.java)).willReturn(ResponseEntity(response, HttpStatus.OK))
 
         val result = stateApi.createWallet("address", "webhook", Blockchain.Ethereum, "applicationId")