@bsv/wallet-toolbox 1.1.6 → 1.1.8

package/test/storage/update.test.ts

@@ -12,21 +12,21 @@ import {
   verifyValues
 } from '../utils/TestUtilsWalletStorage'
 import {
-  ProvenTx,
-  ProvenTxReq,
-  User,
-  Certificate,
-  CertificateField,
-  OutputBasket,
-  Transaction,
-  Commission,
-  Output,
-  OutputTag,
-  OutputTagMap,
-  TxLabel,
-  TxLabelMap,
-  MonitorEvent,
-  SyncState
+  TableProvenTx,
+  TableProvenTxReq,
+  TableUser,
+  TableCertificate,
+  TableCertificateField,
+  TableOutputBasket,
+  TableTransaction,
+  TableCommission,
+  TableOutput,
+  TableOutputTag,
+  TableOutputTagMap,
+  TableTxLabel,
+  TableTxLabelMap,
+  TableMonitorEvent,
+  TableSyncState
 } from '../../src/storage/schema/tables'
 
 setLogging(false)
@@ -106,7 +106,7 @@ describe('update tests', () => {
       const records = await storage.findProvenTxs({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: ProvenTx = {
+          const testValues: TableProvenTx = {
             provenTxId: record.provenTxId,
             txid: 'mockTxid',
             created_at: new Date('2024-12-30T23:00:00Z'),
@@ -205,7 +205,7 @@ describe('update tests', () => {
       const records = await storage.findProvenTxReqs({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: ProvenTxReq = {
+          const testValues: TableProvenTxReq = {
             provenTxReqId: record.provenTxReqId,
             provenTxId: 1,
             batch: `batch-001`,
@@ -287,7 +287,7 @@ describe('update tests', () => {
       const records = await storage.findUsers({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: User = {
+          const testValues: TableUser = {
             userId: record.userId,
             identityKey: `mockUpdatedIdentityKey-${record[primaryKey]}`,
             created_at: new Date('2024-12-30T23:00:00Z'),
@@ -330,7 +330,7 @@ describe('update tests', () => {
       const records = await storage.findCertificates({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: Certificate = {
+          const testValues: TableCertificate = {
             certificateId: record.certificateId,
             userId: 1,
             certifier: `mockCertifier${record.certificateId}`,
@@ -420,7 +420,7 @@ describe('update tests', () => {
       })
       for (const record of records) {
         try {
-          const testValues: CertificateField = {
+          const testValues: TableCertificateField = {
             certificateId: record.certificateId,
             userId: record.userId ?? 1,
             created_at: new Date('2024-12-30T23:00:00Z'),
@@ -472,7 +472,7 @@ describe('update tests', () => {
       const records = await storage.findOutputBaskets({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: OutputBasket = {
+          const testValues: TableOutputBasket = {
             basketId: record.basketId,
             userId: record.userId ?? 1,
             created_at: new Date('2024-12-30T23:00:00Z'),
@@ -533,7 +533,7 @@ describe('update tests', () => {
       const records = await storage.findTransactions({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: Transaction = {
+          const testValues: TableTransaction = {
             transactionId: record.transactionId,
             userId: record.userId ?? 1,
             provenTxId: 1,
@@ -610,7 +610,7 @@ describe('update tests', () => {
       const records = await storage.findCommissions({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: Commission = {
+          const testValues: TableCommission = {
             commissionId: record.commissionId,
             userId: record.userId ?? 1,
             transactionId: record.transactionId ?? 1,
@@ -687,7 +687,7 @@ describe('update tests', () => {
           testVout += 1
         }
         try {
-          const testValues: Output = {
+          const testValues: TableOutput = {
             outputId: record.outputId,
             basketId: record.basketId ?? 1,
             transactionId: testTransactionId,
@@ -768,7 +768,7 @@ describe('update tests', () => {
       }
       for (const record of records) {
         const uniqueTag = `updated_tag_${record.outputTagId}`
-        const testValues: OutputTag = {
+        const testValues: TableOutputTag = {
           outputTagId: record.outputTagId,
           userId: record.userId,
           tag: uniqueTag,
@@ -836,7 +836,7 @@ describe('update tests', () => {
             `Missing outputId for record: ${JSON.stringify(record)}`
           )
         try {
-          const testValues: OutputTagMap = {
+          const testValues: TableOutputTagMap = {
             outputTagId: record.outputTagId,
             outputId: record.outputId,
             created_at: new Date('2024-12-30T23:00:00Z'),
@@ -905,7 +905,7 @@ describe('update tests', () => {
       }
       for (const record of records) {
         const uniqueLabel = `unique_label_${record.txLabelId}`
-        const testValues: TxLabel = {
+        const testValues: TableTxLabel = {
           txLabelId: record.txLabelId,
           userId: record.userId,
           label: uniqueLabel,
@@ -970,7 +970,7 @@ describe('update tests', () => {
         }
       }
       for (const record of records) {
-        const testValues: TxLabelMap = {
+        const testValues: TableTxLabelMap = {
           transactionId: record.transactionId,
           txLabelId: record.txLabelId,
           created_at: new Date('2024-12-30T23:00:00Z'),
@@ -1030,7 +1030,7 @@ describe('update tests', () => {
       const records = await storage.findMonitorEvents({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: MonitorEvent = {
+          const testValues: TableMonitorEvent = {
             id: record.id,
             created_at: new Date('2024-12-30T23:00:00Z'),
             updated_at: new Date('2024-12-30T23:05:00Z'),
@@ -1082,7 +1082,7 @@ describe('update tests', () => {
         }
       }
       for (const record of records) {
-        const testValues: SyncState = {
+        const testValues: TableSyncState = {
           syncStateId: record.syncStateId,
           userId: record.userId,
           refNum: 'test_refNum',

package/test/storage/update2.test.ts

@@ -5,7 +5,6 @@ import {
   sdk,
   StorageProvider,
   StorageKnex,
-  table,
   verifyOne
 } from '../../src/index.all'
 import {
@@ -18,21 +17,21 @@ import {
   verifyValues
 } from '../utils/TestUtilsWalletStorage'
 import {
-  ProvenTx,
-  ProvenTxReq,
-  User,
-  Certificate,
-  CertificateField,
-  OutputBasket,
-  Transaction,
-  Commission,
-  Output,
-  OutputTag,
-  OutputTagMap,
-  TxLabel,
-  TxLabelMap,
-  MonitorEvent,
-  SyncState
+  TableProvenTx,
+  TableProvenTxReq,
+  TableUser,
+  TableCertificate,
+  TableCertificateField,
+  TableOutputBasket,
+  TableTransaction,
+  TableCommission,
+  TableOutput,
+  TableOutputTag,
+  TableOutputTagMap,
+  TableTxLabel,
+  TableTxLabelMap,
+  TableMonitorEvent,
+  TableSyncState
 } from '../../src/storage/schema/tables'
 
 setLogging(false)
@@ -120,7 +119,7 @@ describe('update2 tests', () => {
       const records = await storage.findProvenTxs({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: ProvenTx = {
+          const testValues: TableProvenTx = {
             provenTxId: record.provenTxId,
             txid: 'mockTxid',
             created_at: new Date('2024-12-30T23:00:00Z'),
@@ -280,7 +279,7 @@ describe('update2 tests', () => {
   test('4_update ProvenTx setting individual values', async () => {
     await createDB('ProvenTx4')
     for (const { storage } of setups) {
-      const initialRecord: ProvenTx = {
+      const initialRecord: TableProvenTx = {
         provenTxId: 3,
         txid: 'mockTxid',
         created_at: new Date(),
@@ -336,7 +335,7 @@ describe('update2 tests', () => {
       const records = await storage.findProvenTxReqs({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: ProvenTxReq = {
+          const testValues: TableProvenTxReq = {
             provenTxReqId: record.provenTxReqId,
             provenTxId: 1,
             batch: `batch-001`,
@@ -468,7 +467,7 @@ describe('update2 tests', () => {
     await createDB('ProvenTxReq7')
     for (const { storage } of setups) {
       const referenceTime = new Date()
-      const initialRecord: ProvenTxReq = {
+      const initialRecord: TableProvenTxReq = {
         provenTxReqId: 3,
         provenTxId: 1,
         batch: 'batch',
@@ -484,7 +483,7 @@ describe('update2 tests', () => {
         rawTx: []
       }
       await storage.insertProvenTxReq(initialRecord)
-      const secondRecord: ProvenTxReq = {
+      const secondRecord: TableProvenTxReq = {
         ...initialRecord,
         provenTxReqId: 4,
         txid: 'mockTxid2'
@@ -537,7 +536,7 @@ describe('update2 tests', () => {
       const records = await storage.findUsers({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: User = {
+          const testValues: TableUser = {
             userId: record.userId,
             identityKey: `mockUpdatedIdentityKey-${record[primaryKey]}`,
             created_at: new Date('2024-12-30T23:00:00Z'),
@@ -694,7 +693,7 @@ describe('update2 tests', () => {
   test('12_update User table setting individual values', async () => {
     await createDB('User12')
     for (const { storage } of setups) {
-      const initialRecord: table.User = {
+      const initialRecord: TableUser = {
         userId: 3,
         identityKey: '',
         created_at: new Date(),
@@ -780,7 +779,7 @@ describe('update2 tests', () => {
       const records = await storage.findCertificates({ partial: {} })
       for (const record of records) {
         try {
-          const testValues: Certificate = {
+          const testValues: TableCertificate = {
             certificateId: record.certificateId,
             userId: 1,
             certifier: `mockCertifier${record.certificateId}`,

package/test/utils/TestUtilsWalletStorage.ts

@@ -27,14 +27,28 @@ import {
   StorageProvider,
   StorageKnex,
   StorageSyncReader,
-  table,
   verifyTruthy,
   Wallet,
   Monitor,
   Services,
   WalletStorageManager,
   verifyOne,
-  StorageClient
+  StorageClient,
+  TableOutputBasket,
+  TableOutput,
+  TableMonitorEvent,
+  TableProvenTxReq,
+  TableProvenTx,
+  TableCommission,
+  TableTransaction,
+  TableTxLabelMap,
+  TableTxLabel,
+  TableUser,
+  TableSyncState,
+  TableCertificate,
+  TableCertificateField,
+  TableOutputTagMap,
+  TableOutputTag
 } from '../../src/index.all'
 
 import { Knex, knex as makeKnex } from 'knex'
@@ -714,7 +728,7 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestProvenTx(storage: StorageProvider, txid?: string) {
     const now = new Date()
-    const ptx: table.ProvenTx = {
+    const ptx: TableProvenTx = {
       created_at: now,
       updated_at: now,
       provenTxId: 0,
@@ -737,7 +751,7 @@ export abstract class TestUtilsWalletStorage {
     onlyRequired?: boolean
   ) {
     const now = new Date()
-    const ptxreq: table.ProvenTxReq = {
+    const ptxreq: TableProvenTxReq = {
       // Required:
       created_at: now,
       updated_at: now,
@@ -760,7 +774,7 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestUser(storage: StorageProvider, identityKey?: string) {
     const now = new Date()
-    const e: table.User = {
+    const e: TableUser = {
       created_at: now,
       updated_at: now,
       userId: 0,
@@ -770,10 +784,10 @@ export abstract class TestUtilsWalletStorage {
     return e
   }
 
-  static async insertTestCertificate(storage: StorageProvider, u?: table.User) {
+  static async insertTestCertificate(storage: StorageProvider, u?: TableUser) {
     const now = new Date()
     u ||= await _tu.insertTestUser(storage)
-    const e: table.Certificate = {
+    const e: TableCertificate = {
       created_at: now,
       updated_at: now,
       certificateId: 0,
@@ -793,12 +807,12 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestCertificateField(
     storage: StorageProvider,
-    c: table.Certificate,
+    c: TableCertificate,
     name: string,
     value: string
   ) {
     const now = new Date()
-    const e: table.CertificateField = {
+    const e: TableCertificateField = {
       created_at: now,
       updated_at: now,
       certificateId: c.certificateId,
@@ -813,18 +827,25 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestOutputBasket(
     storage: StorageProvider,
-    u?: table.User | number,
-    partial?: Partial<table.OutputBasket>
+    u?: TableUser | number,
+    partial?: Partial<TableOutputBasket>
   ) {
     const now = new Date()
-    if (typeof u === 'number')
-      u = verifyOne(await storage.findUsers({ partial: { userId: u } }))
-    u ||= await _tu.insertTestUser(storage)
-    const e: table.OutputBasket = {
+    let user: TableUser
+    if (u === undefined) {
+      user = await _tu.insertTestUser(storage)
+    } else if (typeof u === 'number') {
+      user = verifyOne(
+        await storage.findUsers({ partial: { userId: u } })
+      ) as TableUser
+    } else {
+      user = u
+    }
+    const e: TableOutputBasket = {
       created_at: now,
       updated_at: now,
       basketId: 0,
-      userId: u.userId,
+      userId: user.userId,
       name: randomBytesHex(6),
       numberOfDesiredUTXOs: 42,
       minimumDesiredUTXOValue: 1642,
@@ -837,13 +858,13 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestTransaction(
     storage: StorageProvider,
-    u?: table.User,
+    u?: TableUser,
     onlyRequired?: boolean,
-    partial?: Partial<table.Transaction>
+    partial?: Partial<TableTransaction>
   ) {
     const now = new Date()
     u ||= await _tu.insertTestUser(storage)
-    const e: table.Transaction = {
+    const e: TableTransaction = {
       // Required:
       created_at: now,
       updated_at: now,
@@ -868,15 +889,15 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestOutput(
     storage: StorageProvider,
-    t: table.Transaction,
+    t: TableTransaction,
     vout: number,
     satoshis: number,
-    basket?: table.OutputBasket,
+    basket?: TableOutputBasket,
     requiredOnly?: boolean,
-    partial?: Partial<table.Output>
+    partial?: Partial<TableOutput>
   ) {
     const now = new Date()
-    const e: table.Output = {
+    const e: TableOutput = {
       created_at: now,
       updated_at: now,
       outputId: 0,
@@ -909,11 +930,11 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestOutputTag(
     storage: StorageProvider,
-    u: table.User,
-    partial?: Partial<table.OutputTag>
+    u: TableUser,
+    partial?: Partial<TableOutputTag>
   ) {
     const now = new Date()
-    const e: table.OutputTag = {
+    const e: TableOutputTag = {
       created_at: now,
       updated_at: now,
       outputTagId: 0,
@@ -928,11 +949,11 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestOutputTagMap(
     storage: StorageProvider,
-    o: table.Output,
-    tag: table.OutputTag
+    o: TableOutput,
+    tag: TableOutputTag
   ) {
     const now = new Date()
-    const e: table.OutputTagMap = {
+    const e: TableOutputTagMap = {
       created_at: now,
       updated_at: now,
       outputTagId: tag.outputTagId,
@@ -945,11 +966,11 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestTxLabel(
     storage: StorageProvider,
-    u: table.User,
-    partial?: Partial<table.TxLabel>
+    u: TableUser,
+    partial?: Partial<TableTxLabel>
   ) {
     const now = new Date()
-    const e: table.TxLabel = {
+    const e: TableTxLabel = {
       created_at: now,
       updated_at: now,
       txLabelId: 0,
@@ -964,12 +985,12 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestTxLabelMap(
     storage: StorageProvider,
-    tx: table.Transaction,
-    label: table.TxLabel,
-    partial?: Partial<table.TxLabelMap>
+    tx: TableTransaction,
+    label: TableTxLabel,
+    partial?: Partial<TableTxLabelMap>
   ) {
     const now = new Date()
-    const e: table.TxLabelMap = {
+    const e: TableTxLabelMap = {
       created_at: now,
       updated_at: now,
       txLabelId: label.txLabelId,
@@ -981,10 +1002,10 @@ export abstract class TestUtilsWalletStorage {
     return e
   }
 
-  static async insertTestSyncState(storage: StorageProvider, u: table.User) {
+  static async insertTestSyncState(storage: StorageProvider, u: TableUser) {
     const now = new Date()
     const settings = await storage.getSettings()
-    const e: table.SyncState = {
+    const e: TableSyncState = {
       created_at: now,
       updated_at: now,
       syncStateId: 0,
@@ -1002,7 +1023,7 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestMonitorEvent(storage: StorageProvider) {
     const now = new Date()
-    const e: table.MonitorEvent = {
+    const e: TableMonitorEvent = {
       created_at: now,
       updated_at: now,
       id: 0,
@@ -1014,10 +1035,10 @@ export abstract class TestUtilsWalletStorage {
 
   static async insertTestCommission(
     storage: StorageProvider,
-    t: table.Transaction
+    t: TableTransaction
   ) {
     const now = new Date()
-    const e: table.Commission = {
+    const e: TableCommission = {
       created_at: now,
       updated_at: now,
       commissionId: 0,
@@ -1381,45 +1402,45 @@ export abstract class TestUtilsWalletStorage {
 export abstract class _tu extends TestUtilsWalletStorage {}
 
 export interface TestSetup1 {
-  u1: table.User
-  u1basket1: table.OutputBasket
-  u1basket2: table.OutputBasket
-  u1label1: table.TxLabel
-  u1label2: table.TxLabel
-  u1tag1: table.OutputTag
-  u1tag2: table.OutputTag
-  u1tx1: table.Transaction
-  u1comm1: table.Commission
-  u1tx1label1: table.TxLabelMap
-  u1tx1label2: table.TxLabelMap
-  u1tx1o0: table.Output
-  u1o0tag1: table.OutputTagMap
-  u1o0tag2: table.OutputTagMap
-  u1tx1o1: table.Output
-  u1o1tag1: table.OutputTagMap
-  u1cert1: table.Certificate
-  u1cert1field1: table.CertificateField
-  u1cert1field2: table.CertificateField
-  u1cert2: table.Certificate
-  u1cert2field1: table.CertificateField
-  u1cert3: table.Certificate
-  u1sync1: table.SyncState
-
-  u2: table.User
-  u2basket1: table.OutputBasket
-  u2label1: table.TxLabel
-  u2tx1: table.Transaction
-  u2comm1: table.Commission
-  u2tx1label1: table.TxLabelMap
-  u2tx1o0: table.Output
-  u2tx2: table.Transaction
-  u2comm2: table.Commission
-
-  proven1: table.ProvenTx
-  req1: table.ProvenTxReq
-  req2: table.ProvenTxReq
-
-  we1: table.MonitorEvent
+  u1: TableUser
+  u1basket1: TableOutputBasket
+  u1basket2: TableOutputBasket
+  u1label1: TableTxLabel
+  u1label2: TableTxLabel
+  u1tag1: TableOutputTag
+  u1tag2: TableOutputTag
+  u1tx1: TableTransaction
+  u1comm1: TableCommission
+  u1tx1label1: TableTxLabelMap
+  u1tx1label2: TableTxLabelMap
+  u1tx1o0: TableOutput
+  u1o0tag1: TableOutputTagMap
+  u1o0tag2: TableOutputTagMap
+  u1tx1o1: TableOutput
+  u1o1tag1: TableOutputTagMap
+  u1cert1: TableCertificate
+  u1cert1field1: TableCertificateField
+  u1cert1field2: TableCertificateField
+  u1cert2: TableCertificate
+  u1cert2field1: TableCertificateField
+  u1cert3: TableCertificate
+  u1sync1: TableSyncState
+
+  u2: TableUser
+  u2basket1: TableOutputBasket
+  u2label1: TableTxLabel
+  u2tx1: TableTransaction
+  u2comm1: TableCommission
+  u2tx1label1: TableTxLabelMap
+  u2tx1o0: TableOutput
+  u2tx2: TableTransaction
+  u2comm2: TableCommission
+
+  proven1: TableProvenTx
+  req1: TableProvenTxReq
+  req2: TableProvenTxReq
+
+  we1: TableMonitorEvent
 }
 
 export interface MockData {
@@ -2061,7 +2082,7 @@ export async function logTransaction(
 
 export async function logOutput(
   storage: StorageKnex,
-  output: table.Output
+  output: TableOutput
 ): Promise<string> {
   let log = `\n-- Output --\n`
   log += `Outpoint: ${output.txid}:${output.vout}\n`
@@ -2156,7 +2177,7 @@ export async function logInput(
   return log
 }
 
-export function logBasket(basket: table.OutputBasket): string {
+export function logBasket(basket: TableOutputBasket): string {
   return `\n-- Basket --\nName: ${basket.name}\n`
 }
 

package/test/wallet/action/createActionToGenerateBeefs.man.test.ts

@@ -1,10 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import * as bsv from '@bsv/sdk'
-import { sdk, StorageKnex, table, Wallet } from '../../../src/index.all'
+import { sdk, Wallet } from '../../../src/index.all'
 
 import {
   _tu,
-  expectToThrowWERR,
   logTransaction,
   TestKeyPair,
   TestWalletNoSetup,