From 9e06b826e1788c8bcd57e518f9bbb54d97ddcacf Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Fri, 21 Aug 2020 16:31:30 -0500 Subject: [PATCH] Move AddressTagDb to Core (#1850) * Move AddressTagDb to Core * Move to wallet api package --- .../scala/org/bitcoins/server/RoutesSpec.scala | 14 ++++++-------- .../core/api/wallet/db}/AddressTagDb.scala | 2 +- .../bitcoins/wallet/models/AddressTagDAOTest.scala | 1 + .../scala/org/bitcoins/wallet/api/WalletApi.scala | 11 +++-------- .../bitcoins/wallet/internal/AddressHandling.scala | 2 +- .../wallet/internal/TransactionProcessing.scala | 2 +- .../org/bitcoins/wallet/models/AddressTagDAO.scala | 4 +++- 7 files changed, 16 insertions(+), 20 deletions(-) rename {wallet/src/main/scala/org/bitcoins/wallet/models => core/src/main/scala/org/bitcoins/core/api/wallet/db}/AddressTagDb.scala (94%) diff --git a/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala b/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala index b7d0d3bf7f..8e18126a78 100644 --- a/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala +++ b/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala @@ -8,7 +8,11 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest import org.bitcoins.chain.api.ChainApi import org.bitcoins.commons.jsonmodels.wallet.CoinSelectionAlgo import org.bitcoins.core.Core -import org.bitcoins.core.api.wallet.db.{SegwitV0SpendingInfo, SpendingInfoDb} +import org.bitcoins.core.api.wallet.db.{ + AddressTagDb, + SegwitV0SpendingInfo, + SpendingInfoDb +} import org.bitcoins.core.config.RegTest import org.bitcoins.core.crypto.ExtPublicKey import org.bitcoins.core.currency.{Bitcoins, CurrencyUnit, Satoshis} @@ -25,13 +29,7 @@ import org.bitcoins.core.protocol.{BitcoinAddress, BlockStamp, P2PKHAddress} import org.bitcoins.core.psbt.PSBT import org.bitcoins.core.util.FutureUtil import org.bitcoins.core.wallet.fee.{FeeUnit, SatoshisPerVirtualByte} -import org.bitcoins.core.wallet.utxo.{ - AddressLabelTag, - AddressLabelTagType, - AddressTag, - AddressTagType, - TxoState -} +import org.bitcoins.core.wallet.utxo._ import org.bitcoins.crypto.{ DoubleSha256DigestBE, ECPublicKey, diff --git a/wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDb.scala b/core/src/main/scala/org/bitcoins/core/api/wallet/db/AddressTagDb.scala similarity index 94% rename from wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDb.scala rename to core/src/main/scala/org/bitcoins/core/api/wallet/db/AddressTagDb.scala index c895f92481..cdb5d7d756 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDb.scala +++ b/core/src/main/scala/org/bitcoins/core/api/wallet/db/AddressTagDb.scala @@ -1,4 +1,4 @@ -package org.bitcoins.wallet.models +package org.bitcoins.core.api.wallet.db import org.bitcoins.core.protocol.BitcoinAddress import org.bitcoins.core.wallet.utxo.{ diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressTagDAOTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressTagDAOTest.scala index 8c64f870f5..a37dd2af94 100644 --- a/wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressTagDAOTest.scala +++ b/wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressTagDAOTest.scala @@ -2,6 +2,7 @@ package org.bitcoins.wallet.models import java.sql.SQLException +import org.bitcoins.core.api.wallet.db.AddressTagDb import org.bitcoins.core.wallet.utxo.StorageLocationTag.HotStorage import org.bitcoins.core.wallet.utxo.{ AddressTag, diff --git a/wallet/src/main/scala/org/bitcoins/wallet/api/WalletApi.scala b/wallet/src/main/scala/org/bitcoins/wallet/api/WalletApi.scala index 3c3c724d48..79aadbfbb8 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/api/WalletApi.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/api/WalletApi.scala @@ -7,7 +7,7 @@ import org.bitcoins.core.api.chain.ChainQueryApi import org.bitcoins.core.api.feeprovider.FeeRateApi import org.bitcoins.core.api.keymanager.KeyManagerApi import org.bitcoins.core.api.node.NodeApi -import org.bitcoins.core.api.wallet.db.SpendingInfoDb +import org.bitcoins.core.api.wallet.db.{AddressTagDb, SpendingInfoDb} import org.bitcoins.core.config.NetworkParameters import org.bitcoins.core.currency.CurrencyUnit import org.bitcoins.core.hd.AddressType @@ -20,15 +20,10 @@ import org.bitcoins.core.protocol.transaction.{ } import org.bitcoins.core.util.{FutureUtil, StartStopAsync} import org.bitcoins.core.wallet.fee.FeeUnit -import org.bitcoins.core.wallet.utxo._ +import org.bitcoins.core.wallet.utxo.{AddressTag, AddressTagType, TxoState} import org.bitcoins.crypto.DoubleSha256DigestBE import org.bitcoins.wallet.WalletLogger -import org.bitcoins.wallet.models.{ - AddressDb, - AddressTagDb, - ScriptPubKeyDb, - TransactionDb -} +import org.bitcoins.wallet.models.{AddressDb, ScriptPubKeyDb, TransactionDb} import scala.concurrent.{ExecutionContext, Future} import scala.util.{Failure, Success} diff --git a/wallet/src/main/scala/org/bitcoins/wallet/internal/AddressHandling.scala b/wallet/src/main/scala/org/bitcoins/wallet/internal/AddressHandling.scala index e2ab836668..7e219d4278 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/internal/AddressHandling.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/internal/AddressHandling.scala @@ -2,6 +2,7 @@ package org.bitcoins.wallet.internal import java.util.concurrent.atomic.AtomicBoolean +import org.bitcoins.core.api.wallet.db.AddressTagDb import org.bitcoins.core.currency.CurrencyUnit import org.bitcoins.core.hd._ import org.bitcoins.core.number.UInt32 @@ -20,7 +21,6 @@ import org.bitcoins.wallet.models.{ AccountDb, AddressDb, AddressDbHelper, - AddressTagDb, ScriptPubKeyDb } diff --git a/wallet/src/main/scala/org/bitcoins/wallet/internal/TransactionProcessing.scala b/wallet/src/main/scala/org/bitcoins/wallet/internal/TransactionProcessing.scala index 1f175f2b19..76cac3daed 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/internal/TransactionProcessing.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/internal/TransactionProcessing.scala @@ -1,6 +1,6 @@ package org.bitcoins.wallet.internal -import org.bitcoins.core.api.wallet.db.SpendingInfoDb +import org.bitcoins.core.api.wallet.db.{AddressTagDb, SpendingInfoDb} import org.bitcoins.core.currency.CurrencyUnit import org.bitcoins.core.number.UInt32 import org.bitcoins.core.protocol.BitcoinAddress diff --git a/wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDAO.scala b/wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDAO.scala index 8cd5661a7d..3efec0d742 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDAO.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDAO.scala @@ -1,5 +1,7 @@ package org.bitcoins.wallet.models +import org.bitcoins.core.api.wallet.db +import org.bitcoins.core.api.wallet.db.AddressTagDb import org.bitcoins.core.config.NetworkParameters import org.bitcoins.core.protocol.BitcoinAddress import org.bitcoins.core.protocol.transaction.Transaction @@ -177,7 +179,7 @@ case class AddressTagDAO()(implicit private val fromTuple: AddressTagTuple => AddressTagDb = { case (address, tagName, tagType) => - AddressTagDb(address, tagName, tagType) + db.AddressTagDb(address, tagName, tagType) } private val toTuple: AddressTagDb => Option[AddressTagTuple] =