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

Fix SpendingInfoDAO.findOutputsReceived() bug (#4090)

Browse source
This commit is contained in:
Chris Stewart 2022-02-14 10:11:23 -06:00 • committed by GitHub
parent 4d85b7a3d7
commit dc47c070a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testkit/src/main/scala/org/bitcoins/testkit/wallet/WalletTestUtil.scala
View file

@ -266,7 +266,7 @@ object WalletTestUtil {
def insertLegacyUTXO(daos: WalletDAOs, state: TxoState)(implicit
ec: ExecutionContext): Future[LegacySpendingInfo] = {
for {
account <- daos.accountDAO.create(WalletTestUtil.firstAccountDb)
account <- daos.accountDAO.upsert(WalletTestUtil.firstAccountDb)
addr <- daos.addressDAO.create(getAddressDb(account))
utxo = sampleLegacyUTXO(addr.scriptPubKey, state)
_ <- insertDummyIncomingTransaction(daos, utxo)

17
wallet-test/src/test/scala/org/bitcoins/wallet/models/SpendingInfoDAOTest.scala
View file

@ -182,14 +182,21 @@ class SpendingInfoDAOTest extends WalletDAOFixture {
} yield assert(unspent.isEmpty)
}
it must "insert a TXO and read it back with through a TXID " in { daos =>
it must "insert a TXO that is received and find it" in { daos =>
val spendingInfoDAO = daos.utxoDAO
for {
utxo <- WalletTestUtil.insertLegacyUTXO(daos,
state = TxoState.DoesNotExist)
foundTxos <- spendingInfoDAO.findOutputsReceived(Vector(utxo.txid))
} yield assert(foundTxos.contains(utxo))
utxo <- WalletTestUtil.insertLegacyUTXO(
daos,
state = TxoState.PendingConfirmationsReceived)
utxo2 <- WalletTestUtil.insertLegacyUTXO(daos,
state = TxoState.BroadcastSpent)
foundTxos <- spendingInfoDAO.findOutputsReceived(
Vector(utxo.txid, utxo2.txid))
} yield {
assert(foundTxos.length == 1)
assert(foundTxos.contains(utxo))
}
}

4
wallet/src/main/scala/org/bitcoins/wallet/models/SpendingInfoDAO.scala
View file

@ -308,7 +308,9 @@ case class SpendingInfoDAO()(implicit
*/
def findOutputsReceived(
txids: Vector[DoubleSha256DigestBE]): Future[Vector[SpendingInfoDb]] = {
val filtered = spkJoinQuery.filter(_._1.txid.inSet(txids))
val filtered = spkJoinQuery
.filter(_._1.state.inSet(TxoState.receivedStates))
.filter(_._1.txid.inSet(txids))
safeDatabase
.runVec(filtered.result)
.map(res =>