Rename TransactionRecipient.Account

To emphasize the distinction between Account and TransactionRecipient.Account
Electric-Coin-Company · Dec 4, 2024 · 56a3858 · 56a3858
1 parent 9b35832
commit 56a3858
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/derived/TxOutputsView.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/derived/TxOutputsView.kt
@@ -3,7 +3,6 @@ package cash.z.ecc.android.sdk.internal.db.derived
 import androidx.sqlite.db.SupportSQLiteDatabase
 import cash.z.ecc.android.sdk.internal.db.queryAndMap
 import cash.z.ecc.android.sdk.internal.model.OutputProperties
-import cash.z.ecc.android.sdk.model.Account
 import cash.z.ecc.android.sdk.model.FirstClassByteArray
 import cash.z.ecc.android.sdk.model.TransactionRecipient
 import java.util.Locale
@@ -73,9 +72,9 @@ internal class TxOutputsView(private val sqliteDatabase: SupportSQLiteDatabase)
                 if (!it.isNull(toAccountIndex)) {
                     // TODO [#1644]: Refactor Account ZIP32 index across SDK
                     // TODO [#1644]: https://github.com/Electric-Coin-Company/zcash-android-wallet-sdk/issues/1644
-                    TransactionRecipient.Account(0)
+                    TransactionRecipient.RecipientAccount(it.getInt(toAccountIndex))
                 } else {
-                    TransactionRecipient.Address(it.getString(toAddressIndex))
+                    TransactionRecipient.RecipientAddress(it.getString(toAddressIndex))
                 }
             }
         )

diff --git a/...c/main/java/cash/z/ecc/android/sdk/internal/transaction/OutboundTransactionManagerImpl.kt b/...c/main/java/cash/z/ecc/android/sdk/internal/transaction/OutboundTransactionManagerImpl.kt
@@ -31,14 +31,14 @@ internal class OutboundTransactionManagerImpl(
                 memo.toByteArray()
             }
         return when (recipient) {
-            is TransactionRecipient.Account -> {
+            is TransactionRecipient.RecipientAccount -> {
                 encoder.createShieldingTransaction(
                     usk,
                     recipient,
                     memoBytes
                 )
             }
-            is TransactionRecipient.Address -> {
+            is TransactionRecipient.RecipientAddress -> {
                 encoder.createTransaction(
                     usk,
                     amount,

diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/TransactionEncoderImpl.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/TransactionEncoderImpl.kt
@@ -51,7 +51,7 @@ internal class TransactionEncoderImpl(
         recipient: TransactionRecipient,
         memo: ByteArray?
     ): EncodedTransaction {
-        require(recipient is TransactionRecipient.Address)
+        require(recipient is TransactionRecipient.RecipientAddress)
 
         val transactionId = createSpend(usk, amount, recipient.addressValue, memo)
         return repository.findEncodedTransactionByTxId(transactionId)
@@ -63,7 +63,7 @@ internal class TransactionEncoderImpl(
         recipient: TransactionRecipient,
         memo: ByteArray?
     ): EncodedTransaction {
-        require(recipient is TransactionRecipient.Account)
+        require(recipient is TransactionRecipient.RecipientAccount)
 
         val transactionId = createShieldingSpend(usk, memo)
         return repository.findEncodedTransactionByTxId(transactionId)

diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/model/PendingTransaction.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/model/PendingTransaction.kt
@@ -27,11 +27,11 @@ data class PendingTransaction internal constructor(
 }
 
 sealed class TransactionRecipient {
-    data class Address(val addressValue: String) : TransactionRecipient() {
+    data class RecipientAddress(val addressValue: String) : TransactionRecipient() {
         override fun toString() = "TransactionRecipient.Address"
     }
 
-    data class Account(val accountId: Int) : TransactionRecipient() {
+    data class RecipientAccount(val accountValue: cash.z.ecc.android.sdk.model.Account) : TransactionRecipient() {
         override fun toString() = "TransactionRecipient.Account"
     }