adapt to Table Entity prefixes

Author: tonesnotes

src/monitor/tasks/TaskCheckForProofs.ts

@@ -1,9 +1,10 @@
 import {
   asString,
   doubleSha256BE,
-  entity,
+  EntityProvenTx,
+  EntityProvenTxReq,
   sdk,
-  table
+  TableProvenTxReq
 } from '../../index.client'
 import { Monitor } from '../Monitor'
 import { WalletMonitorTask } from './WalletMonitorTask'
@@ -96,17 +97,17 @@ export class TaskCheckForProofs extends WalletMonitorTask {
    * @returns reqs partitioned by status
    */
   async getProofs(
-    reqs: table.TableProvenTxReq[],
+    reqs: TableProvenTxReq[],
     indent = 0,
     countsAsAttempt = false,
     ignoreStatus = false
   ): Promise<{
-    proven: table.TableProvenTxReq[]
-    invalid: table.TableProvenTxReq[]
+    proven: TableProvenTxReq[]
+    invalid: TableProvenTxReq[]
     log: string
   }> {
-    const proven: table.TableProvenTxReq[] = []
-    const invalid: table.TableProvenTxReq[] = []
+    const proven: TableProvenTxReq[] = []
+    const invalid: TableProvenTxReq[] = []
 
     let log = ''
     for (const reqApi of reqs) {
@@ -126,7 +127,7 @@ export class TaskCheckForProofs extends WalletMonitorTask {
         continue
       }
 
-      const req = new entity.EntityProvenTxReq(reqApi)
+      const req = new EntityProvenTxReq(reqApi)
 
       if (Number.isInteger(req.provenTxId)) {
         log += `Already linked to provenTxId ${req.provenTxId}.\n`
@@ -170,7 +171,7 @@ export class TaskCheckForProofs extends WalletMonitorTask {
       const since = new Date()
 
       let r: sdk.GetMerklePathResult
-      let ptx: entity.EntityProvenTx | undefined
+      let ptx: EntityProvenTx | undefined
 
       // External services will try multiple providers until one returns a proof,
       // or they all fail.
@@ -188,7 +189,7 @@ export class TaskCheckForProofs extends WalletMonitorTask {
       // one more time.
       //
       r = await this.monitor.services.getMerklePath(req.txid)
-      ptx = await entity.EntityProvenTx.fromReq(
+      ptx = await EntityProvenTx.fromReq(
         req,
         r,
         countsAsAttempt && req.status !== 'nosend'

src/monitor/tasks/TaskSendWaiting.ts

@@ -1,4 +1,4 @@
-import { entity, table } from '../../storage/index.client'
+import { EntityProvenTxReq, TableProvenTxReq } from '../../storage/index.client'
 import { verifyTruthy } from '../../utility/index.client'
 import { Monitor } from '../Monitor'
 import { WalletMonitorTask } from './WalletMonitorTask'
@@ -63,7 +63,7 @@ export class TaskSendWaiting extends WalletMonitorTask {
    * @param reqApis
    */
   async processUnsent(
-    reqApis: table.TableProvenTxReq[],
+    reqApis: TableProvenTxReq[],
     indent = 0
   ): Promise<string> {
     let log = ''
@@ -75,8 +75,8 @@ export class TaskSendWaiting extends WalletMonitorTask {
         log += `  status now ${reqApi.status}\n`
         continue
       }
-      const req = new entity.EntityProvenTxReq(reqApi)
-      const reqs: entity.EntityProvenTxReq[] = []
+      const req = new EntityProvenTxReq(reqApi)
+      const reqs: EntityProvenTxReq[] = []
       if (req.batch) {
         // Make sure wew process entire batch together for efficient beef generation
         const batchReqApis = await this.storage.findProvenTxReqs({
@@ -89,7 +89,7 @@ export class TaskSendWaiting extends WalletMonitorTask {
           )
           if (index > -1) reqApis.slice(index, index + 1)
           // And add to reqs being processed now:
-          reqs.push(new entity.EntityProvenTxReq(bra))
+          reqs.push(new EntityProvenTxReq(bra))
         }
       } else {
         // Just a single non-batched req...

src/sdk/StorageSyncReader.ts

@@ -1,11 +1,28 @@
-import { sdk, table } from '../index.client'
+import {
+  sdk,
+  TableCertificate,
+  TableCertificateField,
+  TableCommission,
+  TableOutput,
+  TableOutputBasket,
+  TableOutputTag,
+  TableOutputTagMap,
+  TableProvenTx,
+  TableProvenTxReq,
+  TableSettings,
+  TableSyncState,
+  TableTransaction,
+  TableTxLabel,
+  TableTxLabelMap,
+  TableUser
+} from '../index.client'
 
 /**
  * This is the minimal interface required for a WalletStorageProvider to export data to another provider.
  */
 export interface StorageSyncReader {
   isAvailable(): boolean
-  makeAvailable(): Promise<table.Settings>
+  makeAvailable(): Promise<TableSettings>
 
   destroy(): Promise<void>
 
@@ -15,37 +32,37 @@ export interface StorageSyncReader {
   //
   /////////////////
 
-  getSettings(): table.Settings
+  getSettings(): TableSettings
 
-  findUserByIdentityKey(key: string): Promise<table.TableUser | undefined>
+  findUserByIdentityKey(key: string): Promise<TableUser | undefined>
 
-  findSyncStates(args: sdk.FindSyncStatesArgs): Promise<table.TableSyncState[]>
+  findSyncStates(args: sdk.FindSyncStatesArgs): Promise<TableSyncState[]>
 
   findCertificateFields(
     args: sdk.FindCertificateFieldsArgs
-  ): Promise<table.TableCertificateField[]>
-  findCertificates(args: sdk.FindCertificatesArgs): Promise<table.TableCertificate[]>
-  findCommissions(args: sdk.FindCommissionsArgs): Promise<table.TableCommission[]>
+  ): Promise<TableCertificateField[]>
+  findCertificates(args: sdk.FindCertificatesArgs): Promise<TableCertificate[]>
+  findCommissions(args: sdk.FindCommissionsArgs): Promise<TableCommission[]>
   findOutputBaskets(
     args: sdk.FindOutputBasketsArgs
-  ): Promise<table.TableOutputBasket[]>
-  findOutputs(args: sdk.FindOutputsArgs): Promise<table.TableOutput[]>
-  findOutputTags(args: sdk.FindOutputTagsArgs): Promise<table.TableOutputTag[]>
-  findTransactions(args: sdk.FindTransactionsArgs): Promise<table.TableTransaction[]>
-  findTxLabels(args: sdk.FindTxLabelsArgs): Promise<table.TableTxLabel[]>
+  ): Promise<TableOutputBasket[]>
+  findOutputs(args: sdk.FindOutputsArgs): Promise<TableOutput[]>
+  findOutputTags(args: sdk.FindOutputTagsArgs): Promise<TableOutputTag[]>
+  findTransactions(args: sdk.FindTransactionsArgs): Promise<TableTransaction[]>
+  findTxLabels(args: sdk.FindTxLabelsArgs): Promise<TableTxLabel[]>
 
   getProvenTxsForUser(
     args: sdk.FindForUserSincePagedArgs
-  ): Promise<table.TableProvenTx[]>
+  ): Promise<TableProvenTx[]>
   getProvenTxReqsForUser(
     args: sdk.FindForUserSincePagedArgs
-  ): Promise<table.TableProvenTxReq[]>
+  ): Promise<TableProvenTxReq[]>
   getTxLabelMapsForUser(
     args: sdk.FindForUserSincePagedArgs
-  ): Promise<table.TableTxLabelMap[]>
+  ): Promise<TableTxLabelMap[]>
   getOutputTagMapsForUser(
     args: sdk.FindForUserSincePagedArgs
-  ): Promise<table.TableOutputTagMap[]>
+  ): Promise<TableOutputTagMap[]>
 
   getSyncChunk(args: RequestSyncChunkArgs): Promise<SyncChunk>
 }
@@ -131,19 +148,19 @@ export interface SyncChunk {
   toStorageIdentityKey: string
   userIdentityKey: string
 
-  user?: table.TableUser
-  provenTxs?: table.TableProvenTx[]
-  provenTxReqs?: table.TableProvenTxReq[]
-  outputBaskets?: table.TableOutputBasket[]
-  txLabels?: table.TableTxLabel[]
-  outputTags?: table.TableOutputTag[]
-  transactions?: table.TableTransaction[]
-  txLabelMaps?: table.TableTxLabelMap[]
-  commissions?: table.TableCommission[]
-  outputs?: table.TableOutput[]
-  outputTagMaps?: table.TableOutputTagMap[]
-  certificates?: table.TableCertificate[]
-  certificateFields?: table.TableCertificateField[]
+  user?: TableUser
+  provenTxs?: TableProvenTx[]
+  provenTxReqs?: TableProvenTxReq[]
+  outputBaskets?: TableOutputBasket[]
+  txLabels?: TableTxLabel[]
+  outputTags?: TableOutputTag[]
+  transactions?: TableTransaction[]
+  txLabelMaps?: TableTxLabelMap[]
+  commissions?: TableCommission[]
+  outputs?: TableOutput[]
+  outputTagMaps?: TableOutputTagMap[]
+  certificates?: TableCertificate[]
+  certificateFields?: TableCertificateField[]
 }
 
 export interface ProcessSyncChunkResult {