test: fix tests to account for persistence

bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift

@@ -2,34 +2,46 @@ import XCTest
 @testable import BitcoinDevKit
 
 final class LiveTxBuilderTests: XCTestCase {
+    override func tearDownWithError() throws {
+        let fileManager = FileManager.default
+        let dbFileName = "bdk_persistence.db"
+        let documentDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
+        let dbFilePath: URL = documentDirectory.appendingPathComponent(dbFileName)
+
+        if fileManager.fileExists(atPath: dbFilePath.path) {
+            try fileManager.removeItem(at: dbFilePath)
+        }
+    }
+
     func testTxBuilder() throws {
         let descriptor = try Descriptor(
             descriptor: "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
             network: Network.testnet
         )
-//        let wallet = try Wallet.newNoPersist(
-//            descriptor: descriptor,
-//            changeDescriptor: nil,
-//            network: .testnet
-//        )
-//        let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
-//        let update = try esploraClient.fullScan(
-//            wallet: wallet,
-//            stopGap: 10,
-//            parallelRequests: 1
-//        )
-//        try wallet.applyUpdate(update: update)
-//
-//        XCTAssertGreaterThan(wallet.getBalance().total, UInt64(0), "Wallet must have positive balance, please add funds")
-//
-//        let recipient: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .testnet)
-//        let psbt: PartiallySignedTransaction = try TxBuilder()
-//            .addRecipient(script: recipient.scriptPubkey(), amount: 4200)
-//            .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 2.0))
-//            .finish(wallet: wallet)
-//
-//        print(psbt.serialize())
-//        XCTAssertTrue(psbt.serialize().hasPrefix("cHNi"), "PSBT should start with cHNI")
+        let wallet = try Wallet(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            persistenceBackendPath: "bdk_persistence.db",
+            network: .testnet
+        )
+        let esploraClient = EsploraClient(url: "https://esplora.testnet.kuutamo.cloud/")
+        let update = try esploraClient.fullScan(
+            wallet: wallet,
+            stopGap: 10,
+            parallelRequests: 1
+        )
+        try wallet.applyUpdate(update: update)
+
+        XCTAssertGreaterThan(wallet.getBalance().total, UInt64(0), "Wallet must have positive balance, please add funds")
+
+        let recipient: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .testnet)
+        let psbt: PartiallySignedTransaction = try TxBuilder()
+            .addRecipient(script: recipient.scriptPubkey(), amount: 4200)
+            .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 2.0))
+            .finish(wallet: wallet)
+
+        print(psbt.serialize())
+        XCTAssertTrue(psbt.serialize().hasPrefix("cHNi"), "PSBT should start with cHNI")
     }
 
     func testComplexTxBuilder() throws {
@@ -41,37 +53,38 @@ final class LiveTxBuilderTests: XCTestCase {
             descriptor: "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)",
             network: Network.testnet
         )
-//        let wallet = try Wallet.newNoPersist(
-//            descriptor: descriptor,
-//            changeDescriptor: changeDescriptor,
-//            network: .testnet
-//        )
-//        let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
-//        let update = try esploraClient.fullScan(
-//            wallet: wallet,
-//            stopGap: 10,
-//            parallelRequests: 1
-//        )
-//        try wallet.applyUpdate(update: update)
-//
-//        XCTAssertGreaterThan(wallet.getBalance().total, UInt64(0), "Wallet must have positive balance, please add funds")
-//
-//        let recipient1: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .testnet)
-//        let recipient2: Address = try Address(address: "tb1qw2c3lxufxqe2x9s4rdzh65tpf4d7fssjgh8nv6", network: .testnet)
-//        let allRecipients: [ScriptAmount] = [
-//            ScriptAmount(script: recipient1.scriptPubkey(), amount: 4200),
-//            ScriptAmount(script: recipient2.scriptPubkey(), amount: 4200)
-//        ]
-//
-//        let psbt: PartiallySignedTransaction = try TxBuilder()
-//            .setRecipients(recipients: allRecipients)
-//            .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 4.0))
-//            .changePolicy(changePolicy: ChangeSpendPolicy.changeForbidden)
-//            .enableRbf()
-//            .finish(wallet: wallet)
-//
-//        try! wallet.sign(psbt: psbt)
-//
-//        XCTAssertTrue(psbt.serialize().hasPrefix("cHNi"), "PSBT should start with cHNI")
+        let wallet = try Wallet(
+            descriptor: descriptor,
+            changeDescriptor: changeDescriptor,
+            persistenceBackendPath: "bdk_persistence.db",
+            network: .testnet
+        )
+        let esploraClient = EsploraClient(url: "https://esplora.testnet.kuutamo.cloud/")
+        let update = try esploraClient.fullScan(
+            wallet: wallet,
+            stopGap: 10,
+            parallelRequests: 1
+        )
+        try wallet.applyUpdate(update: update)
+
+        XCTAssertGreaterThan(wallet.getBalance().total, UInt64(0), "Wallet must have positive balance, please add funds")
+
+        let recipient1: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .testnet)
+        let recipient2: Address = try Address(address: "tb1qw2c3lxufxqe2x9s4rdzh65tpf4d7fssjgh8nv6", network: .testnet)
+        let allRecipients: [ScriptAmount] = [
+            ScriptAmount(script: recipient1.scriptPubkey(), amount: 4200),
+            ScriptAmount(script: recipient2.scriptPubkey(), amount: 4200)
+        ]
+
+        let psbt: PartiallySignedTransaction = try TxBuilder()
+            .setRecipients(recipients: allRecipients)
+            .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 4.0))
+            .changePolicy(changePolicy: ChangeSpendPolicy.changeForbidden)
+            .enableRbf()
+            .finish(wallet: wallet)
+
+        try! wallet.sign(psbt: psbt)
+
+        XCTAssertTrue(psbt.serialize().hasPrefix("cHNi"), "PSBT should start with cHNI")
     }
 }

bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift

@@ -2,34 +2,46 @@ import XCTest
 @testable import BitcoinDevKit
 
 final class LiveWalletTests: XCTestCase {
+    override func tearDownWithError() throws {
+        let fileManager = FileManager.default
+        let dbFileName = "bdk_persistence.db"
+        let documentDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
+        let dbFilePath: URL = documentDirectory.appendingPathComponent(dbFileName)
+
+        if fileManager.fileExists(atPath: dbFilePath.path) {
+            try fileManager.removeItem(at: dbFilePath)
+        }
+    }
+
     func testSyncedBalance() throws {
         let descriptor = try Descriptor(
             descriptor: "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
             network: Network.testnet
         )
-//        let wallet = try Wallet.newNoPersist(
-//            descriptor: descriptor,
-//            changeDescriptor: nil,
-//            network: .testnet
-//        )
-//        let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
-//        let update = try esploraClient.fullScan(
-//            wallet: wallet,
-//            stopGap: 10,
-//            parallelRequests: 1
-//        )
-//        try wallet.applyUpdate(update: update)
-//
-//        XCTAssertGreaterThan(wallet.getBalance().total, UInt64(0))
-//
-//        print("Transactions count: \(wallet.transactions().count)")
-//        let transactions = wallet.transactions().prefix(3)
-//        for tx in transactions {
-//            let sentAndReceived = wallet.sentAndReceived(tx: tx)
-//            print("Transaction: \(tx.txid())")
-//            print("Sent \(sentAndReceived.sent)")
-//            print("Received \(sentAndReceived.received)")
-//        }
+        let wallet = try Wallet(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            persistenceBackendPath: "bdk_persistence.db",
+            network: .testnet
+        )
+        let esploraClient = EsploraClient(url: "https://esplora.testnet.kuutamo.cloud/")
+        let update = try esploraClient.fullScan(
+            wallet: wallet,
+            stopGap: 10,
+            parallelRequests: 1
+        )
+        try wallet.applyUpdate(update: update)
+
+        XCTAssertGreaterThan(wallet.getBalance().total, UInt64(0))
+
+        print("Transactions count: \(wallet.transactions().count)")
+        let transactions = wallet.transactions().prefix(3)
+        for tx in transactions {
+            let sentAndReceived = wallet.sentAndReceived(tx: tx)
+            print("Transaction: \(tx.txid())")
+            print("Sent \(sentAndReceived.sent)")
+            print("Received \(sentAndReceived.received)")
+        }
     }
     
     func testBroadcastTransaction() throws {
@@ -37,43 +49,44 @@ final class LiveWalletTests: XCTestCase {
             descriptor: "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
             network: Network.testnet
         )
-//        let wallet = try Wallet.newNoPersist(
-//            descriptor: descriptor,
-//            changeDescriptor: nil,
-//            network: .testnet
-//        )
-//        let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
-//        let update = try esploraClient.fullScan(
-//            wallet: wallet,
-//            stopGap: 10,
-//            parallelRequests: 1
-//        )
-//        try wallet.applyUpdate(update: update)
-//
-//        XCTAssertGreaterThan(wallet.getBalance().total, UInt64(0), "Wallet must have positive balance, please add funds")
-//
-//        print("Balance: \(wallet.getBalance().total)")
-//
-//        let recipient: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .testnet)
-//        let psbt: PartiallySignedTransaction = try
-//            TxBuilder()
-//                .addRecipient(script: recipient.scriptPubkey(), amount: 4200)
-//                .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 2.0))
-//                .finish(wallet: wallet)
-//
-//        print(psbt.serialize())
-//        XCTAssertTrue(psbt.serialize().hasPrefix("cHNi"), "PSBT should start with cHNI")
-//
-//        let walletDidSign: Bool = try wallet.sign(psbt: psbt)
-//        XCTAssertTrue(walletDidSign, "Wallet did not sign transaction")
-//
-//        let tx: Transaction = psbt.extractTx()
-//        print(tx.txid())
-//        let fee: UInt64 = try wallet.calculateFee(tx: tx)
-//        print("Transaction Fee: \(fee)")
-//        let feeRate: FeeRate = try wallet.calculateFeeRate(tx: tx)
-//        print("Transaction Fee Rate: \(feeRate.asSatPerVb()) sat/vB")
-//
-//        try esploraClient.broadcast(transaction: tx)
+        let wallet = try Wallet(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            persistenceBackendPath: "bdk_persistence.db",
+            network: .testnet
+        )
+        let esploraClient = EsploraClient(url: "https://esplora.testnet.kuutamo.cloud/")
+        let update = try esploraClient.fullScan(
+            wallet: wallet,
+            stopGap: 10,
+            parallelRequests: 1
+        )
+        try wallet.applyUpdate(update: update)
+
+        XCTAssertGreaterThan(wallet.getBalance().total, UInt64(0), "Wallet must have positive balance, please add funds")
+
+        print("Balance: \(wallet.getBalance().total)")
+
+        let recipient: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .testnet)
+        let psbt: PartiallySignedTransaction = try
+            TxBuilder()
+                .addRecipient(script: recipient.scriptPubkey(), amount: 4200)
+                .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 2.0))
+                .finish(wallet: wallet)
+
+        print(psbt.serialize())
+        XCTAssertTrue(psbt.serialize().hasPrefix("cHNi"), "PSBT should start with cHNI")
+
+        let walletDidSign: Bool = try wallet.sign(psbt: psbt)
+        XCTAssertTrue(walletDidSign, "Wallet did not sign transaction")
+
+        let tx: Transaction = psbt.extractTx()
+        print(tx.txid())
+        let fee: UInt64 = try wallet.calculateFee(tx: tx)
+        print("Transaction Fee: \(fee)")
+        let feeRate: FeeRate = try wallet.calculateFeeRate(tx: tx)
+        print("Transaction Fee Rate: \(feeRate.asSatPerVb()) sat/vB")
+
+        try esploraClient.broadcast(transaction: tx)
     }
 }

bdk-swift/Tests/BitcoinDevKitTests/OfflineWalletTests.swift

@@ -2,28 +2,40 @@ import XCTest
 @testable import BitcoinDevKit
 
 final class OfflineWalletTests: XCTestCase {
+    override func tearDownWithError() throws {
+        let fileManager = FileManager.default
+        let dbFileName = "bdk_persistence.db"
+        let documentDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
+        let dbFilePath: URL = documentDirectory.appendingPathComponent(dbFileName)
+
+        if fileManager.fileExists(atPath: dbFilePath.path) {
+            try fileManager.removeItem(at: dbFilePath)
+        }
+    }
+
     func testNewAddress() throws {
         let descriptor: Descriptor = try Descriptor(
             descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
             network: Network.testnet
         )
-//        let wallet: Wallet = try Wallet.newNoPersist(
-//            descriptor: descriptor,
-//            changeDescriptor: nil,
-//            network: .testnet
-//        )
-//        let addressInfo: AddressInfo = wallet.getAddress(addressIndex: AddressIndex.new)
-//
-//        XCTAssertTrue(addressInfo.address.isValidForNetwork(network: Network.testnet),
-//                     "Address is not valid for testnet network")
-//        XCTAssertTrue(addressInfo.address.isValidForNetwork(network: Network.signet),
-//                     "Address is not valid for signet network")
-//        XCTAssertFalse(addressInfo.address.isValidForNetwork(network: Network.regtest),
-//                      "Address is valid for regtest network, but it shouldn't be")
-//        XCTAssertFalse(addressInfo.address.isValidForNetwork(network: Network.bitcoin),
-//                      "Address is valid for bitcoin network, but it shouldn't be")
-//
-//        XCTAssertEqual(addressInfo.address.asString(), "tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e")
+        let wallet: Wallet = try Wallet(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            persistenceBackendPath: "bdk_persistence.db",
+            network: .testnet
+        )
+        let addressInfo: AddressInfo = wallet.getAddress(addressIndex: AddressIndex.new)
+
+        XCTAssertTrue(addressInfo.address.isValidForNetwork(network: Network.testnet),
+                     "Address is not valid for testnet network")
+        XCTAssertTrue(addressInfo.address.isValidForNetwork(network: Network.signet),
+                     "Address is not valid for signet network")
+        XCTAssertFalse(addressInfo.address.isValidForNetwork(network: Network.regtest),
+                      "Address is valid for regtest network, but it shouldn't be")
+        XCTAssertFalse(addressInfo.address.isValidForNetwork(network: Network.bitcoin),
+                      "Address is valid for bitcoin network, but it shouldn't be")
+
+        XCTAssertEqual(addressInfo.address.asString(), "tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e")
     }
     
     func testBalance() throws {
@@ -31,12 +43,13 @@ final class OfflineWalletTests: XCTestCase {
             descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
             network: Network.testnet
         )
-//        let wallet: Wallet = try Wallet.newNoPersist(
-//            descriptor: descriptor,
-//            changeDescriptor: nil,
-//            network: .testnet
-//        )
-//
-//        XCTAssertEqual(wallet.getBalance().total, 0)
+        let wallet: Wallet = try Wallet(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            persistenceBackendPath: "bdk_persistence.db",
+            network: .testnet
+        )
+
+        XCTAssertEqual(wallet.getBalance().total, 0)
     }
 }