diff --git a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/models/DLCRemoteTxDAO.scala b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/models/DLCRemoteTxDAO.scala index 2fa1be16f6..88bdeff0e2 100644 --- a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/models/DLCRemoteTxDAO.scala +++ b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/models/DLCRemoteTxDAO.scala @@ -25,7 +25,7 @@ case class DLCRemoteTxDAO()(implicit TableQuery[DLCRemoteTxTable] class DLCRemoteTxTable(tag: Tag) - extends TxTable[TransactionDb](tag, schemaName, "watch_only_tx_table") { + extends TxTable(tag, schemaName, "watch_only_tx_table") { def txIdBE: Rep[DoubleSha256DigestBE] = column("txIdBE", O.PrimaryKey) def transaction: Rep[Transaction] = column("transaction") diff --git a/wallet/src/main/scala/org/bitcoins/wallet/models/IncomingTransactionDAO.scala b/wallet/src/main/scala/org/bitcoins/wallet/models/IncomingTransactionDAO.scala index 200fd8bfd9..329ec10780 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/models/IncomingTransactionDAO.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/models/IncomingTransactionDAO.scala @@ -24,7 +24,7 @@ case class IncomingTransactionDAO()(implicit } class IncomingTransactionTable(tag: Tag) - extends TxTable[IncomingTransactionDb]( + extends TxTable( tag, schemaName, "wallet_incoming_txs" diff --git a/wallet/src/main/scala/org/bitcoins/wallet/models/OutgoingTransactionDAO.scala b/wallet/src/main/scala/org/bitcoins/wallet/models/OutgoingTransactionDAO.scala index 9085de85e4..0a6530f2d7 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/models/OutgoingTransactionDAO.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/models/OutgoingTransactionDAO.scala @@ -25,7 +25,7 @@ case class OutgoingTransactionDAO()(implicit } class OutgoingTransactionTable(tag: Tag) - extends TxTable[OutgoingTransactionDb]( + extends TxTable( tag, schemaName, "wallet_outgoing_txs" diff --git a/wallet/src/main/scala/org/bitcoins/wallet/models/TransactionDAO.scala b/wallet/src/main/scala/org/bitcoins/wallet/models/TransactionDAO.scala index 5ff35d204d..dd35ba375e 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/models/TransactionDAO.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/models/TransactionDAO.scala @@ -15,7 +15,7 @@ trait TxCRUDComponent[DbEntryType <: TxDB] { self: CRUD[DbEntryType, DoubleSha256DigestBE] => import profile.api._ - abstract class TxTable[DbEntryType <: TxDB]( + abstract class TxTable( tag: profile.api.Tag, schemaName: Option[String], tableName: String @@ -34,26 +34,25 @@ trait TxDAO[DbEntryType <: TxDB] private val mappers = new org.bitcoins.db.DbCommonsColumnMappers(profile) import mappers._ - type DbTable = TxTable[DbEntryType] - override val table: TableQuery[_ <: DbTable] + override val table: TableQuery[? <: TxTable] override def createAll(ts: Vector[DbEntryType]): Future[Vector[DbEntryType]] = createAllNoAutoInc(ts, safeDatabase) override def findByPrimaryKeys( txIdBEs: Vector[DoubleSha256DigestBE] - ): Query[DbTable, DbEntryType, Seq] = + ): Query[TxTable, DbEntryType, Seq] = table.filter(_.txIdBE.inSet(txIdBEs)) override def findByPrimaryKey( txIdBE: DoubleSha256DigestBE - ): Query[DbTable, DbEntryType, Seq] = { + ): Query[TxTable, DbEntryType, Seq] = { table.filter(_.txIdBE === txIdBE) } override def findAll( txs: Vector[DbEntryType] - ): Query[DbTable, DbEntryType, Seq] = + ): Query[TxTable, DbEntryType, Seq] = findByPrimaryKeys(txs.map(_.txIdBE)) def findByOutPoint( @@ -118,8 +117,7 @@ case class TransactionDAO()(implicit private val mappers = new org.bitcoins.db.DbCommonsColumnMappers(profile) import mappers._ - override val table - : slick.lifted.TableQuery[TransactionDAO.this.TransactionTable] = + override val table: slick.lifted.TableQuery[TransactionTable] = TableQuery[TransactionTable] def findAllUnconfirmed(): Future[Vector[TransactionDb]] = { @@ -135,7 +133,7 @@ case class TransactionDAO()(implicit } class TransactionTable(tag: Tag) - extends TxTable[TransactionDb](tag, schemaName, "tx_table") { + extends TxTable(tag, schemaName, "tx_table") { def txIdBE: Rep[DoubleSha256DigestBE] = column("txIdBE", O.PrimaryKey)