remove daedalus_deleteWallet

Author: lemastero

src/main/scala/io/iohk/ethereum/jsonrpc/JsonMethodsImplicits.scala

@@ -309,20 +309,6 @@ object JsonMethodsImplicits extends JsonMethodsImplicits {
       JBool(t.result)
   }
 
-  implicit val daedalus_deleteWallet = new Codec[DeleteWalletRequest, DeleteWalletResponse] {
-    def decodeJson(params: Option[JArray]): Either[JsonRpcError, DeleteWalletRequest] = {
-      params match {
-        case Some(JArray(JString(addr) :: _)) =>
-          extractAddress(addr).map(DeleteWalletRequest)
-        case _ =>
-          Left(InvalidParams())
-      }
-    }
-
-    def encodeJson(t: DeleteWalletResponse): JValue =
-      JBool(t.result)
-  }
-
   implicit val daedalus_changePassphrase = new Codec[ChangePassphraseRequest, ChangePassphraseResponse] {
     def decodeJson(params: Option[JArray]): Either[JsonRpcError, ChangePassphraseRequest] = {
       params match {

src/main/scala/io/iohk/ethereum/jsonrpc/JsonRpcController.scala

@@ -328,9 +328,6 @@ class JsonRpcController(
     case req @ JsonRpcRequest(_, "daedalus_getAccountTransactions", _, _) =>
       handle[GetAccountTransactionsRequest, GetAccountTransactionsResponse](ethService.getAccountTransactions, req)
 
-    case req @ JsonRpcRequest(_, "daedalus_deleteWallet", _, _) =>
-      handle[DeleteWalletRequest, DeleteWalletResponse](personalService.deleteWallet, req)
-
     case req @ JsonRpcRequest(_, "daedalus_changePassphrase", _, _) =>
       handle[ChangePassphraseRequest, ChangePassphraseResponse](personalService.changePassphrase, req)
   }

src/main/scala/io/iohk/ethereum/jsonrpc/PersonalService.scala

@@ -55,9 +55,6 @@ object PersonalService {
   case class EcRecoverRequest(message: ByteString, signature: ECDSASignature)
   case class EcRecoverResponse(address: Address)
 
-  case class DeleteWalletRequest(address: Address)
-  case class DeleteWalletResponse(result: Boolean)
-
   case class ChangePassphraseRequest(address: Address, oldPassphrase: String, newPassphrase: String)
   case class ChangePassphraseResponse()
 
@@ -181,14 +178,6 @@ class PersonalService(
     }
   }
 
-  def deleteWallet(request: DeleteWalletRequest): ServiceResponse[DeleteWalletResponse] = Future {
-    unlockedWallets.remove(request.address)
-
-    keyStore.deleteWallet(request.address)
-      .map(DeleteWalletResponse.apply)
-      .left.map(handleError)
-  }
-
   def changePassphrase(request: ChangePassphraseRequest): ServiceResponse[ChangePassphraseResponse] = Future {
     import request._
     keyStore.changePassphrase(address, oldPassphrase, newPassphrase)

src/main/scala/io/iohk/ethereum/keystore/KeyStore.scala

@@ -36,8 +36,6 @@ trait KeyStore {
 
   def unlockAccount(address: Address, passphrase: String): Either[KeyStoreError, Wallet]
 
-  def deleteWallet(address: Address): Either[KeyStoreError, Boolean]
-
   def changePassphrase(address: Address, oldPassphrase: String, newPassphrase: String): Either[KeyStoreError, Unit]
 }
 
@@ -95,11 +93,6 @@ class KeyStoreImpl(keyStoreConfig: KeyStoreConfig, secureRandom: SecureRandom) e
   def unlockAccount(address: Address, passphrase: String): Either[KeyStoreError, Wallet] =
     load(address).flatMap(_.decrypt(passphrase).left.map(_ => DecryptionFailed)).map(key => Wallet(address, key))
 
-  def deleteWallet(address: Address): Either[KeyStoreError, Boolean] = for {
-    fileName <- findKeyFileName(address)
-    deleted  <- deleteFile(fileName)
-  } yield deleted
-
   def changePassphrase(address: Address, oldPassphrase: String, newPassphrase: String): Either[KeyStoreError, Unit] = for {
     _           <- validateNewPassPhrase(newPassphrase)
     oldEncKey   <- load(address)

src/test/scala/io/iohk/ethereum/jsonrpc/JsonRpcControllerSpec.scala

@@ -573,23 +573,6 @@ class JsonRpcControllerSpec
     response.result shouldBe Some(JArray(peers.map(info => JString(info.toString))))
   }
 
-  it should "daedalus_deleteWallet" in new TestSetup {
-    val address = Address(42)
-    val params = JArray(JString(address.toString) :: Nil)
-
-    (personalService.deleteWallet _)
-      .expects(DeleteWalletRequest(address))
-      .returning(Future.successful(Right(DeleteWalletResponse(true))))
-
-    val rpcRequest = JsonRpcRequest("2.0", "daedalus_deleteWallet", Some(params), Some(1))
-    val response = jsonRpcController.handleRequest(rpcRequest).futureValue
-
-    response.jsonrpc shouldBe "2.0"
-    response.id shouldBe JInt(1)
-    response.error shouldBe None
-    response.result shouldBe Some(JBool(true))
-  }
-
   it should "daedalus_changePassphrase" in new TestSetup {
     val address = Address(42)
     val oldPassphrase = "weakpass"

src/test/scala/io/iohk/ethereum/jsonrpc/PersonalServiceSpec.scala

@@ -390,24 +390,6 @@ class PersonalServiceSpec
     }
   }
 
-  it should "delete existing wallet" in new TestSetup {
-    (keyStore.deleteWallet _)
-      .expects(address)
-      .returning(Right(true))
-
-    val delRes = personal.deleteWallet(DeleteWalletRequest(address)).futureValue
-    delRes shouldEqual Right(DeleteWalletResponse(true))
-  }
-
-  it should "return error when deleting not existing wallet" in new TestSetup {
-    (keyStore.deleteWallet _)
-      .expects(address)
-      .returning(Left(KeyStore.KeyNotFound))
-
-    val delRes = personal.deleteWallet(DeleteWalletRequest(address)).futureValue
-    delRes shouldEqual Left(KeyNotFound)
-  }
-
   it should "handle changing passwords" in new TestSetup {
     type KeyStoreRes = Either[KeyStoreError, Unit]
     type ServiceRes = Either[JsonRpcError, ChangePassphraseResponse]

src/test/scala/io/iohk/ethereum/keystore/KeyStoreImplSpec.scala

@@ -108,9 +108,6 @@ class KeyStoreImplSpec extends AnyFlatSpec with Matchers with BeforeAndAfter wit
 
     val res3 = keyStore.listAccounts()
     res3 should matchPattern { case Left(IOError(_)) => }
-
-    val res4 = keyStore.deleteWallet(Address(key))
-    res4 should matchPattern { case Left(IOError(_)) => }
   }
 
   it should "unlock an account provided a correct passphrase" in new TestSetup {
@@ -131,24 +128,6 @@ class KeyStoreImplSpec extends AnyFlatSpec with Matchers with BeforeAndAfter wit
     res shouldEqual Left(KeyNotFound)
   }
 
-  it should "return an error deleting not existing wallet" in new TestSetup {
-    val res = keyStore.deleteWallet(addr1)
-    res shouldEqual Left(KeyNotFound)
-  }
-
-  it should "delete existing wallet " in new TestSetup {
-    val newAddr1 = keyStore.newAccount("aaaaaaaa").right.get
-    val listOfNewAccounts = keyStore.listAccounts().right.get
-    listOfNewAccounts.toSet shouldEqual Set(newAddr1)
-
-
-    val res = keyStore.deleteWallet(newAddr1).right.get
-    res shouldBe true
-
-    val listOfNewAccountsAfterDelete = keyStore.listAccounts().right.get
-    listOfNewAccountsAfterDelete.toSet shouldEqual Set.empty
-  }
-
   it should "change passphrase of an existing wallet" in new TestSetup {
     val oldPassphrase = "weakpass"
     val newPassphrase = "very5tr0ng&l0ngp4s5phr4s3"