feat: use trait on mnemonic + descriptor

reez · web-flow · commit 91cd1e59bfcc · 2024-06-13T10:42:53.000-05:00
diff --git a/BDKSwiftExampleWallet/Resources/Localizable.xcstrings b/BDKSwiftExampleWallet/Resources/Localizable.xcstrings
@@ -80,8 +80,15 @@
     "%@ sats fee" : {
 
     },
-    "%lld Transactions" : {
-
+    "%lld %@" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "%1$lld %2$@"
+          }
+        }
+      }
     },
     "%lld. %@" : {
       "localizations" : {
diff --git a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
@@ -35,7 +35,7 @@ private class BDKService {
             throw WalletError.walletNotFound
         }
         let addressInfo = try wallet.revealNextAddress(keychain: .external)
-        return addressInfo.address.asString()
+        return addressInfo.address.description
     }
 
     func getBalance() throws -> Balance {
@@ -64,7 +64,7 @@ private class BDKService {
             needsFullScan = true
         } else {
             let mnemonic = Mnemonic(wordCount: WordCount.words12)
-            words12 = mnemonic.asString()
+            words12 = mnemonic.description
             needsFullScan = false
         }
         let mnemonic = try Mnemonic.fromString(mnemonic: words12)
@@ -84,9 +84,9 @@ private class BDKService {
             network: network
         )
         let backupInfo = BackupInfo(
-            mnemonic: mnemonic.asString(),
-            descriptor: descriptor.asStringPrivate(),
-            changeDescriptor: changeDescriptor.asStringPrivate()
+            mnemonic: mnemonic.description,
+            descriptor: descriptor.description,
+            changeDescriptor: changeDescriptor.toStringWithSecret()
         )
 
         try keyService.saveBackupInfo(backupInfo)
diff --git a/BDKSwiftExampleWallet/Service/Key Service/KeyService.swift b/BDKSwiftExampleWallet/Service/Key Service/KeyService.swift
@@ -139,9 +139,9 @@ extension KeyClient {
                     network: mockKeyClientNetwork
                 )
                 let backupInfo = BackupInfo(
-                    mnemonic: mnemonic.asString(),
-                    descriptor: descriptor.asString(),
-                    changeDescriptor: changeDescriptor.asStringPrivate()
+                    mnemonic: mnemonic.description,
+                    descriptor: descriptor.description,
+                    changeDescriptor: changeDescriptor.toStringWithSecret()
                 )
                 return backupInfo
             },
diff --git a/BDKSwiftExampleWalletTests/Service/BDKSwiftExampleWalletKeyServiceTests.swift b/BDKSwiftExampleWalletTests/Service/BDKSwiftExampleWalletKeyServiceTests.swift
@@ -34,9 +34,9 @@ final class BDKSwiftExampleWalletKeyServiceTests: XCTestCase {
             network: mockKeyClientNetwork
         )
         let backupInfoMock = BackupInfo(
-            mnemonic: mnemonic.asString(),
-            descriptor: descriptor.asString(),
-            changeDescriptor: changeDescriptor.asStringPrivate()
+            mnemonic: mnemonic.description,
+            descriptor: descriptor.description,
+            changeDescriptor: changeDescriptor.toStringWithSecret()
         )
 
         XCTAssertEqual(backupInfo, backupInfoMock)

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private class BDKService {`
`35`	`35`	`throw WalletError.walletNotFound`
`36`	`36`	`}`
`37`	`37`	`let addressInfo = try wallet.revealNextAddress(keychain: .external)`
`38`		`- return addressInfo.address.asString()`
	`38`	`+ return addressInfo.address.description`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func getBalance() throws -> Balance {`
`@@ -64,7 +64,7 @@ private class BDKService {`
`64`	`64`	`needsFullScan = true`
`65`	`65`	`} else {`
`66`	`66`	`let mnemonic = Mnemonic(wordCount: WordCount.words12)`
`67`		`- words12 = mnemonic.asString()`
	`67`	`+ words12 = mnemonic.description`
`68`	`68`	`needsFullScan = false`
`69`	`69`	`}`
`70`	`70`	`let mnemonic = try Mnemonic.fromString(mnemonic: words12)`
`@@ -84,9 +84,9 @@ private class BDKService {`
`84`	`84`	`network: network`
`85`	`85`	`)`
`86`	`86`	`let backupInfo = BackupInfo(`
`87`		`- mnemonic: mnemonic.asString(),`
`88`		`- descriptor: descriptor.asStringPrivate(),`
`89`		`- changeDescriptor: changeDescriptor.asStringPrivate()`
	`87`	`+ mnemonic: mnemonic.description,`
	`88`	`+ descriptor: descriptor.description,`
	`89`	`+ changeDescriptor: changeDescriptor.toStringWithSecret()`
`90`	`90`	`)`
`91`	`91`
`92`	`92`	`try keyService.saveBackupInfo(backupInfo)`
Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,9 @@ extension KeyClient {`
`139`	`139`	`network: mockKeyClientNetwork`
`140`	`140`	`)`
`141`	`141`	`let backupInfo = BackupInfo(`
`142`		`- mnemonic: mnemonic.asString(),`
`143`		`- descriptor: descriptor.asString(),`
`144`		`- changeDescriptor: changeDescriptor.asStringPrivate()`
	`142`	`+ mnemonic: mnemonic.description,`
	`143`	`+ descriptor: descriptor.description,`
	`144`	`+ changeDescriptor: changeDescriptor.toStringWithSecret()`
`145`	`145`	`)`
`146`	`146`	`return backupInfo`
`147`	`147`	`},`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ final class BDKSwiftExampleWalletKeyServiceTests: XCTestCase {`
`34`	`34`	`network: mockKeyClientNetwork`
`35`	`35`	`)`
`36`	`36`	`let backupInfoMock = BackupInfo(`
`37`		`- mnemonic: mnemonic.asString(),`
`38`		`- descriptor: descriptor.asString(),`
`39`		`- changeDescriptor: changeDescriptor.asStringPrivate()`
	`37`	`+ mnemonic: mnemonic.description,`
	`38`	`+ descriptor: descriptor.description,`
	`39`	`+ changeDescriptor: changeDescriptor.toStringWithSecret()`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`XCTAssertEqual(backupInfo, backupInfoMock)`