diff --git a/BDKSwiftExampleWallet.xcodeproj/project.pbxproj b/BDKSwiftExampleWallet.xcodeproj/project.pbxproj index 2fe86465..7dc2cd84 100644 --- a/BDKSwiftExampleWallet.xcodeproj/project.pbxproj +++ b/BDKSwiftExampleWallet.xcodeproj/project.pbxproj @@ -64,7 +64,6 @@ AE91CEED2C0FDB70000AAD20 /* SentAndReceivedValues+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE91CEEC2C0FDB70000AAD20 /* SentAndReceivedValues+Extensions.swift */; }; AE91CEEF2C0FDBC7000AAD20 /* CanonicalTx+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE91CEEE2C0FDBC7000AAD20 /* CanonicalTx+Extensions.swift */; }; AE96F6622A424C400055623C /* BDKSwiftExampleWalletReceiveViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE96F6612A424C400055623C /* BDKSwiftExampleWalletReceiveViewModelTests.swift */; }; - AEA9BEB32AA8081800C523CA /* BDKError+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEA9BEB22AA8081800C523CA /* BDKError+Extensions.swift */; }; AEAB03112ABDDB86000C9528 /* FeeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEAB03102ABDDB86000C9528 /* FeeViewModel.swift */; }; AEAB03132ABDDBF4000C9528 /* AmountViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEAB03122ABDDBF4000C9528 /* AmountViewModel.swift */; }; AEAF83B62B7BD4D10019B23B /* CodeScanner in Frameworks */ = {isa = PBXBuildFile; productRef = AEAF83B52B7BD4D10019B23B /* CodeScanner */; }; @@ -156,7 +155,6 @@ AE91CEEC2C0FDB70000AAD20 /* SentAndReceivedValues+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentAndReceivedValues+Extensions.swift"; sourceTree = ""; }; AE91CEEE2C0FDBC7000AAD20 /* CanonicalTx+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CanonicalTx+Extensions.swift"; sourceTree = ""; }; AE96F6612A424C400055623C /* BDKSwiftExampleWalletReceiveViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BDKSwiftExampleWalletReceiveViewModelTests.swift; sourceTree = ""; }; - AEA9BEB22AA8081800C523CA /* BDKError+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BDKError+Extensions.swift"; sourceTree = ""; }; AEAB03102ABDDB86000C9528 /* FeeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeeViewModel.swift; sourceTree = ""; }; AEAB03122ABDDBF4000C9528 /* AmountViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmountViewModel.swift; sourceTree = ""; }; AEB130C82A44E4850087785B /* TransactionDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionDetailView.swift; sourceTree = ""; }; @@ -506,7 +504,6 @@ AE6F34D72AA6C1800087E700 /* Network+Extensions.swift */, AE6F34D92AA6C1E00087E700 /* Balance+Extensions.swift */, AE184EFB2BFE52C800374362 /* Amount+Extensions.swift */, - AEA9BEB22AA8081800C523CA /* BDKError+Extensions.swift */, AE91CEEC2C0FDB70000AAD20 /* SentAndReceivedValues+Extensions.swift */, AE91CEEE2C0FDBC7000AAD20 /* CanonicalTx+Extensions.swift */, ); @@ -647,7 +644,6 @@ AE7953902A2D5B4400CCB277 /* BDKSwiftExampleWalletError.swift in Sources */, AE91CEEF2C0FDBC7000AAD20 /* CanonicalTx+Extensions.swift in Sources */, AE2381B52C60878E00F6B00C /* LocalOutputItemView.swift in Sources */, - AEA9BEB32AA8081800C523CA /* BDKError+Extensions.swift in Sources */, AE3646262BEDB01200B04E25 /* FileManager+Extensions.swift in Sources */, AEB6C9D12B7E8529003AD704 /* TransactionDetailViewModel.swift in Sources */, AE18E9382A9528200019D2A4 /* Bundle+Extensions.swift in Sources */, diff --git a/BDKSwiftExampleWallet/Extensions/BDK+Extensions/BDKError+Extensions.swift b/BDKSwiftExampleWallet/Extensions/BDK+Extensions/BDKError+Extensions.swift deleted file mode 100644 index d7d95bcf..00000000 --- a/BDKSwiftExampleWallet/Extensions/BDK+Extensions/BDKError+Extensions.swift +++ /dev/null @@ -1,145 +0,0 @@ -// -// BDKError+Extensions.swift -// BDKSwiftExampleWallet -// -// Created by Matthew Ramsden on 9/5/23. -// - -import BitcoinDevKit -import Foundation - -extension CalculateFeeError { - var description: String { - switch self { - case .MissingTxOut(let outPoints): - return outPoints.description - case .NegativeFee(let fee): - return fee.description - } - } -} - -extension CannotConnectError { - var description: String { - switch self { - case .Include(let height): - return "Include height \(height)" - } - } -} - -extension DescriptorError { - var description: String { - switch self { - case .InvalidHdKeyPath: - return "InvalidHdKeyPath" - case .InvalidDescriptorChecksum: - return "InvalidDescriptorChecksum" - case .HardenedDerivationXpub: - return "HardenedDerivationXpub" - case .MultiPath: - return "MultiPath" - case .Key(let errorMessage): - return errorMessage - case .Policy(let errorMessage): - return errorMessage - case .InvalidDescriptorCharacter(let char): - return char - case .Bip32(let errorMessage): - return errorMessage - case .Base58(let errorMessage): - return errorMessage - case .Pk(let errorMessage): - return errorMessage - case .Miniscript(let errorMessage): - return errorMessage - case .Hex(let errorMessage): - return errorMessage - case .ExternalAndInternalAreTheSame: - return "ExternalAndInternalAreTheSame" - } - } -} - -extension EsploraError { - var description: String { - switch self { - case .HeaderHeightNotFound(let height): - return height.description - case .TransactionNotFound: - return "Transaction not found." - case .HeaderHashNotFound: - return "Header hash not found." - case .Minreq(let errorMessage): - return errorMessage - case .HttpResponse(let status, let errorMessage): - return "\(status): \(errorMessage)" - case .Parsing(let errorMessage): - return errorMessage - case .StatusCode(let errorMessage): - return errorMessage - case .BitcoinEncoding(let errorMessage): - return errorMessage - case .HexToArray(let errorMessage): - return errorMessage - case .HexToBytes(let errorMessage): - return errorMessage - case .InvalidHttpHeaderName(let name): - return name - case .InvalidHttpHeaderValue(let value): - return value - case .RequestAlreadyConsumed: - return "Request Already Consumed." - } - } -} - -extension PersistenceError { - var description: String { - switch self { - case .Write(let errorMessage): - return "Write \(errorMessage)" - } - } -} - -extension SignerError { - var description: String { - switch self { - case .MissingKey: - return "MissingKey" - case .InvalidKey: - return "InvalidKey" - case .UserCanceled: - return "UserCanceled" - case .InputIndexOutOfRange: - return "InputIndexOutOfRange" - case .MissingNonWitnessUtxo: - return "MissingNonWitnessUtxo" - case .InvalidNonWitnessUtxo: - return "InvalidNonWitnessUtxo" - case .MissingWitnessUtxo: - return "MissingWitnessUtxo" - case .MissingWitnessScript: - return "MissingWitnessScript" - case .MissingHdKeypath: - return "MissingHdKeypath" - case .NonStandardSighash: - return "NonStandardSighash" - case .InvalidSighash: - return "InvalidSighash" - case .MiniscriptPsbt(let errorMessage): - return errorMessage - case .External(let errorMessage): - return errorMessage - case .SighashP2wpkh(let errorMessage): - return errorMessage - case .SighashTaproot(let errorMessage): - return errorMessage - case .TxInputsIndexError(let errorMessage): - return errorMessage - case .Psbt(let errorMessage): - return errorMessage - } - } -}