mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-26 01:29:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename clearUtxosAndAddreses(account) -> clearUtxos(account) (#4206)

Browse source
This commit is contained in:
Chris Stewart 2022-03-22 13:08:03 -05:00 • committed by GitHub
parent f16167642b
commit 413dbcacbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/scala/org/bitcoins/core/api/wallet/HDWalletApi.scala
View file

@ -455,7 +455,7 @@ trait HDWalletApi extends WalletApi {
override def clearAllUtxos(): Future[HDWalletApi]
def clearUtxosAndAddresses(account: HDAccount): Future[HDWalletApi]
def clearUtxos(account: HDAccount): Future[HDWalletApi]
/** Gets the address associated with the pubkey at
* the resulting `BIP32Path` determined by the

2
wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala
View file

@ -42,7 +42,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoindNewest {
addresses <- wallet.addressDAO.findAllForAccount(account)
_ = assert(addresses.nonEmpty)
_ <- wallet.clearUtxosAndAddresses(account)
_ <- wallet.clearUtxos(account)
clearedUtxos <- wallet.spendingInfoDAO.findAllForAccount(account)
clearedAddresses <- wallet.addressDAO.findAllForAccount(account)

2
wallet/src/main/scala/org/bitcoins/wallet/Wallet.scala
View file

@ -257,7 +257,7 @@ abstract class Wallet
spendingInfoCount <- spendingInfoDAO.count()
} yield addressCount == 0 && spendingInfoCount == 0
override def clearUtxosAndAddresses(account: HDAccount): Future[Wallet] = {
override def clearUtxos(account: HDAccount): Future[Wallet] = {
val aggregatedActions: DBIOAction[
Wallet,
NoStream,

2
wallet/src/main/scala/org/bitcoins/wallet/internal/RescanHandling.scala
View file

@ -74,7 +74,7 @@ private[wallet] trait RescanHandling extends WalletLogger {
case (None, false) =>
Future.successful(None)
}
_ <- clearUtxosAndAddresses(account)
_ <- clearUtxos(account)
_ <- doNeutrinoRescan(account, start, endOpt, addressBatchSize)
} yield {
RescanState.RescanDone