Refactor: moved 'entity' package into 'db'.
Now it is more clear that these files are related to the databases. Plus, there's one less folder at the top-level, which reduces clutter.
This commit is contained in:
parent
c70da1983d
commit
dce743d9f9
|
@ -4,7 +4,7 @@ import androidx.test.platform.app.InstrumentationRegistry
|
|||
import cash.z.wallet.sdk.Initializer
|
||||
import cash.z.wallet.sdk.Synchronizer
|
||||
import cash.z.wallet.sdk.Synchronizer.Status.SYNCED
|
||||
import cash.z.wallet.sdk.entity.isSubmitSuccess
|
||||
import cash.z.wallet.sdk.db.entity.isSubmitSuccess
|
||||
import cash.z.wallet.sdk.ext.*
|
||||
import cash.z.wallet.sdk.import
|
||||
import cash.z.wallet.sdk.jni.RustBackend
|
||||
|
|
|
@ -4,7 +4,7 @@ import androidx.test.platform.app.InstrumentationRegistry
|
|||
import cash.z.wallet.sdk.Initializer
|
||||
import cash.z.wallet.sdk.Synchronizer
|
||||
import cash.z.wallet.sdk.Synchronizer.Status.SYNCED
|
||||
import cash.z.wallet.sdk.entity.isSubmitSuccess
|
||||
import cash.z.wallet.sdk.db.entity.isSubmitSuccess
|
||||
import cash.z.wallet.sdk.ext.*
|
||||
import cash.z.wallet.sdk.jni.RustBackend
|
||||
import cash.z.wallet.sdk.service.LightWalletGrpcService
|
||||
|
|
|
@ -11,7 +11,7 @@ import cash.z.wallet.sdk.block.CompactBlockProcessor
|
|||
import cash.z.wallet.sdk.block.CompactBlockProcessor.State.*
|
||||
import cash.z.wallet.sdk.block.CompactBlockProcessor.WalletBalance
|
||||
import cash.z.wallet.sdk.block.CompactBlockStore
|
||||
import cash.z.wallet.sdk.entity.*
|
||||
import cash.z.wallet.sdk.db.entity.*
|
||||
import cash.z.wallet.sdk.exception.SynchronizerException
|
||||
import cash.z.wallet.sdk.ext.*
|
||||
import cash.z.wallet.sdk.rpc.Service
|
||||
|
|
|
@ -3,8 +3,8 @@ package cash.z.wallet.sdk
|
|||
import androidx.paging.PagedList
|
||||
import cash.z.wallet.sdk.block.CompactBlockProcessor
|
||||
import cash.z.wallet.sdk.block.CompactBlockProcessor.WalletBalance
|
||||
import cash.z.wallet.sdk.entity.ConfirmedTransaction
|
||||
import cash.z.wallet.sdk.entity.PendingTransaction
|
||||
import cash.z.wallet.sdk.db.entity.ConfirmedTransaction
|
||||
import cash.z.wallet.sdk.db.entity.PendingTransaction
|
||||
import cash.z.wallet.sdk.ext.ConsensusBranchId
|
||||
import cash.z.wallet.sdk.rpc.Service
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
|
|
|
@ -5,7 +5,7 @@ import androidx.room.Room
|
|||
import androidx.room.RoomDatabase
|
||||
import cash.z.wallet.sdk.db.CompactBlockDao
|
||||
import cash.z.wallet.sdk.db.CompactBlockDb
|
||||
import cash.z.wallet.sdk.entity.CompactBlockEntity
|
||||
import cash.z.wallet.sdk.db.entity.CompactBlockEntity
|
||||
import cash.z.wallet.sdk.ext.ZcashSdk.SAPLING_ACTIVATION_HEIGHT
|
||||
import cash.z.wallet.sdk.rpc.CompactFormats
|
||||
import kotlinx.coroutines.Dispatchers.IO
|
||||
|
|
|
@ -4,7 +4,7 @@ import androidx.annotation.VisibleForTesting
|
|||
import cash.z.wallet.sdk.BuildConfig
|
||||
import cash.z.wallet.sdk.annotation.OpenForTesting
|
||||
import cash.z.wallet.sdk.block.CompactBlockProcessor.State.*
|
||||
import cash.z.wallet.sdk.entity.ConfirmedTransaction
|
||||
import cash.z.wallet.sdk.db.entity.ConfirmedTransaction
|
||||
import cash.z.wallet.sdk.exception.CompactBlockProcessorException
|
||||
import cash.z.wallet.sdk.exception.CompactBlockProcessorException.EnhanceTransactionError.EnhanceTxDecryptError
|
||||
import cash.z.wallet.sdk.exception.CompactBlockProcessorException.EnhanceTransactionError.EnhanceTxDownloadError
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package cash.z.wallet.sdk.db
|
||||
|
||||
import androidx.room.*
|
||||
import cash.z.wallet.sdk.entity.CompactBlockEntity
|
||||
import cash.z.wallet.sdk.db.entity.CompactBlockEntity
|
||||
|
||||
|
||||
//
|
||||
|
|
|
@ -7,7 +7,7 @@ import androidx.room.Query
|
|||
import androidx.room.RoomDatabase
|
||||
import androidx.room.migration.Migration
|
||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||
import cash.z.wallet.sdk.entity.*
|
||||
import cash.z.wallet.sdk.db.entity.*
|
||||
|
||||
//
|
||||
// Database
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package cash.z.wallet.sdk.db
|
||||
|
||||
import androidx.room.*
|
||||
import cash.z.wallet.sdk.entity.PendingTransactionEntity
|
||||
import cash.z.wallet.sdk.db.entity.PendingTransactionEntity
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
package cash.z.wallet.sdk.entity
|
||||
package cash.z.wallet.sdk.db.entity
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
||||
import androidx.room.ForeignKey
|
||||
import androidx.room.Ignore
|
||||
|
||||
@Entity(
|
||||
tableName = "accounts",
|
|
@ -1,4 +1,4 @@
|
|||
package cash.z.wallet.sdk.entity
|
||||
package cash.z.wallet.sdk.db.entity
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
|
@ -1,4 +1,4 @@
|
|||
package cash.z.wallet.sdk.entity
|
||||
package cash.z.wallet.sdk.db.entity
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
|
@ -1,4 +1,4 @@
|
|||
package cash.z.wallet.sdk.entity
|
||||
package cash.z.wallet.sdk.db.entity
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
|
@ -1,4 +1,4 @@
|
|||
package cash.z.wallet.sdk.entity
|
||||
package cash.z.wallet.sdk.db.entity
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
|
@ -1,4 +1,4 @@
|
|||
package cash.z.wallet.sdk.entity
|
||||
package cash.z.wallet.sdk.db.entity
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
|
@ -4,12 +4,10 @@ import android.content.Context
|
|||
import androidx.paging.PagedList
|
||||
import androidx.room.Room
|
||||
import androidx.room.RoomDatabase
|
||||
import androidx.room.migration.Migration
|
||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||
import cash.z.wallet.sdk.db.BlockDao
|
||||
import cash.z.wallet.sdk.db.DerivedDataDb
|
||||
import cash.z.wallet.sdk.db.TransactionDao
|
||||
import cash.z.wallet.sdk.entity.ConfirmedTransaction
|
||||
import cash.z.wallet.sdk.db.entity.ConfirmedTransaction
|
||||
import cash.z.wallet.sdk.ext.ZcashSdk
|
||||
import cash.z.wallet.sdk.ext.android.toFlowPagedList
|
||||
import cash.z.wallet.sdk.ext.android.toRefreshable
|
||||
|
|
|
@ -5,12 +5,10 @@ import androidx.room.Room
|
|||
import androidx.room.RoomDatabase
|
||||
import cash.z.wallet.sdk.db.PendingTransactionDao
|
||||
import cash.z.wallet.sdk.db.PendingTransactionDb
|
||||
import cash.z.wallet.sdk.entity.PendingTransaction
|
||||
import cash.z.wallet.sdk.entity.PendingTransactionEntity
|
||||
import cash.z.wallet.sdk.entity.isCancelled
|
||||
import cash.z.wallet.sdk.entity.isSubmitted
|
||||
import cash.z.wallet.sdk.exception.LightwalletException
|
||||
import cash.z.wallet.sdk.ext.ConsensusBranchId
|
||||
import cash.z.wallet.sdk.db.entity.PendingTransaction
|
||||
import cash.z.wallet.sdk.db.entity.PendingTransactionEntity
|
||||
import cash.z.wallet.sdk.db.entity.isCancelled
|
||||
import cash.z.wallet.sdk.db.entity.isSubmitted
|
||||
import cash.z.wallet.sdk.ext.twig
|
||||
import cash.z.wallet.sdk.service.LightWalletService
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package cash.z.wallet.sdk.transaction
|
||||
|
||||
import cash.z.wallet.sdk.entity.EncodedTransaction
|
||||
import cash.z.wallet.sdk.db.entity.EncodedTransaction
|
||||
|
||||
interface TransactionEncoder {
|
||||
/**
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package cash.z.wallet.sdk.transaction
|
||||
|
||||
import cash.z.wallet.sdk.entity.PendingTransaction
|
||||
import cash.z.wallet.sdk.db.entity.PendingTransaction
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package cash.z.wallet.sdk.transaction
|
||||
|
||||
import androidx.paging.PagedList
|
||||
import cash.z.wallet.sdk.entity.*
|
||||
import cash.z.wallet.sdk.db.entity.*
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package cash.z.wallet.sdk.transaction
|
||||
|
||||
import cash.z.wallet.sdk.entity.EncodedTransaction
|
||||
import cash.z.wallet.sdk.db.entity.EncodedTransaction
|
||||
import cash.z.wallet.sdk.exception.TransactionEncoderException
|
||||
import cash.z.wallet.sdk.ext.*
|
||||
import cash.z.wallet.sdk.jni.RustBackend
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package cash.z.wallet.sdk.block
|
||||
|
||||
import cash.z.wallet.sdk.entity.CompactBlockEntity
|
||||
import cash.z.wallet.sdk.db.entity.CompactBlockEntity
|
||||
import cash.z.wallet.sdk.ext.TroubleshootingTwig
|
||||
import cash.z.wallet.sdk.ext.Twig
|
||||
import cash.z.wallet.sdk.ext.ZcashSdk.SAPLING_ACTIVATION_HEIGHT
|
||||
|
|
Loading…
Reference in New Issue