diff --git a/.github/workflows/PostgresTests.yml b/.github/workflows/PostgresTests.yml index 462a9791aa..a095c6dbf8 100644 --- a/.github/workflows/PostgresTests.yml +++ b/.github/workflows/PostgresTests.yml @@ -30,4 +30,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.5 downloadBitcoind dbCommonsTest/test walletTest/test chainTest/test nodeTest/test + run: sbt ++2.13.5 downloadBitcoind dbCommonsTest/test walletTest/test dlcWalletTest/test chainTest/test nodeTest/test diff --git a/dlc-wallet/src/main/resources/postgresql/dlc/migration/V1__dlc_db_baseline.sql b/dlc-wallet/src/main/resources/postgresql/dlc/migration/V1__dlc_db_baseline.sql index 0de6da6955..3520313a33 100644 --- a/dlc-wallet/src/main/resources/postgresql/dlc/migration/V1__dlc_db_baseline.sql +++ b/dlc-wallet/src/main/resources/postgresql/dlc/migration/V1__dlc_db_baseline.sql @@ -5,7 +5,7 @@ CREATE TABLE "global_dlc_data" "contract_id" TEXT UNIQUE, "protocol_version" INTEGER NOT NULL, "state" TEXT NOT NULL, - "is_initiator" INTEGER NOT NULL, + "is_initiator" BOOLEAN NOT NULL, "account" TEXT NOT NULL, "change_index" INTEGER NOT NULL, "key_index" INTEGER NOT NULL, @@ -102,7 +102,7 @@ CREATE TABLE "funding_inputs" ( "out_point" TEXT PRIMARY KEY, "dlc_id" TEXT NOT NULL, - "is_initiator" INTEGER NOT NULL, + "is_initiator" BOOLEAN NOT NULL, "input_serial_id" TEXT NOT NULL, "output" TEXT NOT NULL, "max_witness_length" INTEGER NOT NULL, 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 bab6b8d50f..09120c55d1 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 @@ -7,7 +7,7 @@ import org.bitcoins.core.protocol.transaction.Transaction import org.bitcoins.crypto.DoubleSha256DigestBE import org.bitcoins.dlc.wallet.DLCAppConfig import org.bitcoins.wallet.models.TxDAO -import slick.lifted.{PrimaryKey, ProvenShape} +import slick.lifted.ProvenShape import scala.concurrent.ExecutionContext @@ -56,8 +56,5 @@ case class DLCRemoteTxDAO()(implicit numOutputs, locktime, blockHash).<>(TransactionDb.tupled, TransactionDb.unapply) - - def primaryKey: PrimaryKey = - primaryKey("pk_tx", sourceColumns = txIdBE) } }