From b630cfbf5c72c8ae3f2ac099dfc77fd8a962c8c0 Mon Sep 17 00:00:00 2001
From: Torkel Rogstad <torkel@rogstad.io>
Date: Tue, 18 Jun 2019 19:28:39 +0200
Subject: [PATCH] Generalize DAO fixture for wallet

---
 .../org/bitcoins/wallet/models/AccountDAOTest.scala      | 7 ++++---
 .../org/bitcoins/wallet/models/AddressDAOTest.scala      | 9 +++++----
 .../wallet/models/IncomingTransactionDAOTest.scala       | 5 +++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/models/AccountDAOTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/models/AccountDAOTest.scala
index 66dd73638a..65ca67ffae 100644
--- a/wallet-test/src/test/scala/org/bitcoins/wallet/models/AccountDAOTest.scala
+++ b/wallet-test/src/test/scala/org/bitcoins/wallet/models/AccountDAOTest.scala
@@ -1,12 +1,13 @@
 package org.bitcoins.wallet.models
 
 import org.bitcoins.testkit.core.gen.CryptoGenerators
-import org.bitcoins.wallet.fixtures.AccountDAOFixture
+import org.bitcoins.wallet.fixtures.WalletDAOFixture
 import org.bitcoins.testkit.wallet.{BitcoinSWalletTest, WalletTestUtil}
 
-class AccountDAOTest extends BitcoinSWalletTest with AccountDAOFixture {
+class AccountDAOTest extends BitcoinSWalletTest with WalletDAOFixture {
 
-  it should "insert and read an account into the database" in { accountDAO =>
+  it should "insert and read an account into the database" in { daos =>
+    val accountDAO = daos.accountDAO
     for {
       created <- {
         val account = WalletTestUtil.firstAccount
diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressDAOTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressDAOTest.scala
index 9eecb31d06..a80d426279 100644
--- a/wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressDAOTest.scala
+++ b/wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressDAOTest.scala
@@ -7,7 +7,7 @@ import org.bitcoins.core.crypto.ECPublicKey
 import org.bitcoins.core.protocol.P2SHAddress
 import org.bitcoins.core.script.ScriptType
 import org.bitcoins.core.util.CryptoUtil
-import org.bitcoins.wallet.fixtures.AddressDAOFixture
+import org.bitcoins.wallet.fixtures.WalletDAOFixture
 import org.bitcoins.testkit.wallet.{BitcoinSWalletTest, WalletTestUtil}
 import org.bitcoins.core.hd.HDChainType
 import org.bitcoins.core.hd.SegWitHDPath
@@ -18,7 +18,7 @@ import org.bitcoins.core.protocol.script.ScriptPubKey
 import org.bitcoins.core.protocol.Bech32Address
 import org.bitcoins.core.protocol.script.P2WPKHWitnessV0
 
-class AddressDAOTest extends BitcoinSWalletTest with AddressDAOFixture {
+class AddressDAOTest extends BitcoinSWalletTest with WalletDAOFixture {
 
   // todo: do this with an actual working address
   // todo: with script witness + redeem script
@@ -45,7 +45,7 @@ class AddressDAOTest extends BitcoinSWalletTest with AddressDAOFixture {
 
   it should "fail to insert and read an address into the database without a corresponding account" in {
     daos =>
-      val (_, addressDAO) = daos
+      val addressDAO = daos.addressDAO
       val readF = {
         val addressDb = getAddressDb(WalletTestUtil.firstAccountDb)
         addressDAO.create(addressDb)
@@ -56,7 +56,8 @@ class AddressDAOTest extends BitcoinSWalletTest with AddressDAOFixture {
 
   it should "insert and read an address into the database with a corresponding account" in {
     daos =>
-      val (accountDAO, addressDAO) = daos
+      val accountDAO = daos.accountDAO
+      val addressDAO = daos.addressDAO
       for {
         createdAccount <- {
           val account = WalletTestUtil.firstAccountDb
diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/models/IncomingTransactionDAOTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/models/IncomingTransactionDAOTest.scala
index 5964a8b3a0..70ea25b082 100644
--- a/wallet-test/src/test/scala/org/bitcoins/wallet/models/IncomingTransactionDAOTest.scala
+++ b/wallet-test/src/test/scala/org/bitcoins/wallet/models/IncomingTransactionDAOTest.scala
@@ -14,7 +14,7 @@ import org.bitcoins.core.hd.LegacyHDPath
 
 class IncomingTransactionDAOTest
     extends BitcoinSWalletTest
-    with IncomingTransactionDAOFixture {
+    with WalletDAOFixture {
   private def getTx: Transaction =
     TransactionGenerators.transaction
       .suchThat(_.outputs.nonEmpty)
@@ -23,7 +23,8 @@ class IncomingTransactionDAOTest
 
   it must "insert a incoming transaction and read it back with its address" in {
     daos =>
-      val (txDao, addrDao) = daos
+      val txDao = daos.incomingTxDAO
+      val addrDao = daos.addressDAO
       implicit val walletconf: WalletAppConfig = config
       val accountDAO = AccountDAO()