@bsv/wallet-toolbox 1.1.7 → 1.1.9

package/src/storage/schema/entities/__tests/ProvenTxTests.test.ts

@@ -1,10 +1,10 @@
 import * as bsv from '@bsv/sdk'
-import { entity, table, sdk } from '../../../../../src'
+import { createSyncMap, sdk, SyncMap } from '../../../../../src'
 import {
   TestUtilsWalletStorage as _tu,
   TestWalletNoSetup
 } from '../../../../../test/utils/TestUtilsWalletStorage'
-import { ProvenTx } from '../../../../../src/storage/schema/entities/ProvenTx'
+import { EntityProvenTx } from '../../../../../src/storage/schema/entities/ProvenTx'
 
 describe('ProvenTx class method tests', () => {
   jest.setTimeout(99999999)
@@ -122,7 +122,7 @@ describe('ProvenTx class method tests', () => {
     }
 
     // Call the method under test
-    const result = await ProvenTx.fromTxid(txid, services)
+    const result = await EntityProvenTx.fromTxid(txid, services)
 
     // Validate the ProvenTx result
     expect(result.proven).toBeDefined()
@@ -145,7 +145,7 @@ describe('ProvenTx class method tests', () => {
     const services: sdk.WalletServices = ctx.services
 
     // Call the method under test
-    const result = await ProvenTx.fromTxid(txid, services)
+    const result = await EntityProvenTx.fromTxid(txid, services)
 
     // Validate that ProvenTx could not be created
     expect(result.proven).toBeUndefined()
@@ -162,7 +162,7 @@ describe('ProvenTx class method tests', () => {
     const merkleProof = await services.getMerklePath(txid)
 
     // Call the method under test
-    const result = await ProvenTx.fromTxid(txid, services)
+    const result = await EntityProvenTx.fromTxid(txid, services)
 
     // Validate the ProvenTx result
     expect(result.proven).toBeUndefined()
@@ -185,7 +185,7 @@ describe('ProvenTx class method tests', () => {
     }
 
     // Initialize the ProvenTx entity with mock data
-    const provenTx = new ProvenTx(mockData)
+    const provenTx = new EntityProvenTx(mockData)
 
     // Validate getters
     expect(provenTx.provenTxId).toBe(mockData.provenTxId)
@@ -228,7 +228,7 @@ describe('ProvenTx class method tests', () => {
 
     // Validate overridden methods
     expect(provenTx.id).toBe(2)
-    expect(provenTx.entityName).toBe('ProvenTx')
+    expect(provenTx.entityName).toBe('provenTx')
     expect(provenTx.entityTable).toBe('proven_txs')
 
     // Update id via overridden setter
@@ -242,7 +242,7 @@ describe('ProvenTx class method tests', () => {
     const ctx2 = ctxs2[0]
 
     // Insert a ProvenTx into the first database
-    const provenTx1 = new ProvenTx({
+    const provenTx1 = new EntityProvenTx({
       provenTxId: 401,
       txid: 'valid-txid',
       created_at: new Date('2023-01-01'),
@@ -258,7 +258,7 @@ describe('ProvenTx class method tests', () => {
     await ctx1.activeStorage.insertProvenTx(provenTx1.toApi())
 
     // Insert a matching ProvenTx into the second database
-    const provenTx2 = new ProvenTx({
+    const provenTx2 = new EntityProvenTx({
       provenTxId: 401,
       txid: 'valid-txid',
       created_at: new Date('2023-01-01'),
@@ -273,81 +273,8 @@ describe('ProvenTx class method tests', () => {
 
     await ctx2.activeStorage.insertProvenTx(provenTx2.toApi())
 
-    // Create a valid SyncMap
-    const syncMap: entity.SyncMap = {
-      provenTx: {
-        idMap: { [provenTx1.provenTxId]: provenTx2.provenTxId },
-        entityName: 'ProvenTx',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      transaction: {
-        idMap: {},
-        entityName: 'Transaction',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputBasket: {
-        idMap: {},
-        entityName: 'OutputBasket',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTxReq: {
-        idMap: {},
-        entityName: 'ProvenTxReq',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabel: {
-        idMap: {},
-        entityName: 'TxLabel',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabelMap: {
-        idMap: {},
-        entityName: 'TxLabelMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      output: {
-        idMap: {},
-        entityName: 'Output',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTag: {
-        idMap: {},
-        entityName: 'OutputTag',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTagMap: {
-        idMap: {},
-        entityName: 'OutputTagMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificate: {
-        idMap: {},
-        entityName: 'Certificate',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificateField: {
-        idMap: {},
-        entityName: 'CertificateField',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      commission: {
-        idMap: {},
-        entityName: 'Commission',
-        maxUpdated_at: undefined,
-        count: 0
-      }
-    }
+    const syncMap = createSyncMap()
+    syncMap.provenTx.idMap = { [provenTx1.provenTxId]: provenTx2.provenTxId }
 
     // Verify the ProvenTx entities match
     expect(provenTx1.equals(provenTx2.toApi(), syncMap)).toBe(true)
@@ -355,7 +282,7 @@ describe('ProvenTx class method tests', () => {
 
   // Test: equals identifies non-matching txid
   test('5_equals: identifies non-matching txid', async () => {
-    const provenTx1 = new ProvenTx({
+    const provenTx1 = new EntityProvenTx({
       provenTxId: 102,
       txid: 'txid1',
       created_at: new Date('2023-01-01'),
@@ -368,7 +295,7 @@ describe('ProvenTx class method tests', () => {
       merkleRoot: 'merkle-root'
     })
 
-    const provenTx2 = new ProvenTx({
+    const provenTx2 = new EntityProvenTx({
       provenTxId: 103,
       txid: 'txid2',
       created_at: new Date('2023-01-01'),
@@ -386,7 +313,7 @@ describe('ProvenTx class method tests', () => {
 
   // Test: equals identifies non-matching height
   test('6_equals: identifies non-matching height', async () => {
-    const provenTx1 = new ProvenTx({
+    const provenTx1 = new EntityProvenTx({
       provenTxId: 104,
       txid: 'valid-txid',
       created_at: new Date('2023-01-01'),
@@ -399,7 +326,7 @@ describe('ProvenTx class method tests', () => {
       merkleRoot: 'merkle-root'
     })
 
-    const provenTx2 = new ProvenTx({
+    const provenTx2 = new EntityProvenTx({
       provenTxId: 105,
       txid: 'valid-txid',
       created_at: new Date('2023-01-01'),
@@ -417,7 +344,7 @@ describe('ProvenTx class method tests', () => {
 
   // Test: equals identifies non-matching merklePath
   test('7_equals: identifies non-matching merklePath', async () => {
-    const provenTx1 = new ProvenTx({
+    const provenTx1 = new EntityProvenTx({
       provenTxId: 106,
       txid: 'valid-txid',
       created_at: new Date('2023-01-01'),
@@ -430,7 +357,7 @@ describe('ProvenTx class method tests', () => {
       merkleRoot: 'merkle-root'
     })
 
-    const provenTx2 = new ProvenTx({
+    const provenTx2 = new EntityProvenTx({
       provenTxId: 107,
       txid: 'valid-txid',
       created_at: new Date('2023-01-01'),
@@ -448,7 +375,7 @@ describe('ProvenTx class method tests', () => {
 
   // Test: equals identifies non-matching syncMap
   test('8_equals: identifies non-matching syncMap', async () => {
-    const provenTx1 = new ProvenTx({
+    const provenTx1 = new EntityProvenTx({
       provenTxId: 108,
       txid: 'valid-txid',
       created_at: new Date('2023-01-01'),
@@ -461,7 +388,7 @@ describe('ProvenTx class method tests', () => {
       merkleRoot: 'merkle-root'
     })
 
-    const provenTx2 = new ProvenTx({
+    const provenTx2 = new EntityProvenTx({
       provenTxId: 109,
       txid: 'valid-txid',
       created_at: new Date('2023-01-01'),
@@ -474,80 +401,8 @@ describe('ProvenTx class method tests', () => {
       merkleRoot: 'merkle-root'
     })
 
-    const syncMap: entity.SyncMap = {
-      provenTx: {
-        idMap: { 108: 999 },
-        entityName: 'ProvenTx',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      transaction: {
-        idMap: {},
-        entityName: 'Transaction',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputBasket: {
-        idMap: {},
-        entityName: 'OutputBasket',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTxReq: {
-        idMap: {},
-        entityName: 'ProvenTxReq',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabel: {
-        idMap: {},
-        entityName: 'TxLabel',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabelMap: {
-        idMap: {},
-        entityName: 'TxLabelMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      output: {
-        idMap: {},
-        entityName: 'Output',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTag: {
-        idMap: {},
-        entityName: 'OutputTag',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTagMap: {
-        idMap: {},
-        entityName: 'OutputTagMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificate: {
-        idMap: {},
-        entityName: 'Certificate',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificateField: {
-        idMap: {},
-        entityName: 'CertificateField',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      commission: {
-        idMap: {},
-        entityName: 'Commission',
-        maxUpdated_at: undefined,
-        count: 0
-      }
-    }
+    const syncMap = createSyncMap()
+    syncMap.provenTx.idMap = { 108: 999 }
 
     expect(provenTx1.equals(provenTx2.toApi(), syncMap)).toBe(false)
   })
@@ -557,7 +412,7 @@ describe('ProvenTx class method tests', () => {
     const ctx2 = ctxs2[0]
 
     // Insert a ProvenTx record into the first database
-    const tx1 = new ProvenTx({
+    const tx1 = new EntityProvenTx({
       provenTxId: 405,
       txid: 'txid1',
       created_at: new Date('2023-01-01'),
@@ -572,7 +427,7 @@ describe('ProvenTx class method tests', () => {
     await ctx1.activeStorage.insertProvenTx(tx1.toApi())
 
     // Insert a different ProvenTx record into the second database with a mismatched provenTxId
-    const tx2 = new ProvenTx({
+    const tx2 = new EntityProvenTx({
       provenTxId: 406,
       txid: 'txid1',
       created_at: new Date('2023-01-01'),
@@ -594,7 +449,7 @@ describe('ProvenTx class method tests', () => {
     const ctx = ctxs[0]
 
     // Create a ProvenTx entity
-    const provenTx = new ProvenTx({
+    const provenTx = new EntityProvenTx({
       provenTxId: 101,
       txid: 'txid1',
       created_at: new Date('2023-01-01'),
@@ -607,82 +462,11 @@ describe('ProvenTx class method tests', () => {
       merkleRoot: 'merkle-root-1'
     })
 
+    const mockSyncMap = createSyncMap()
+    mockSyncMap.provenTx.idMap = { [provenTx.provenTxId]: provenTx.provenTxId }
+
     // Create mock storage, syncMap, and trx token
     const mockStorage = ctx.activeStorage
-    const mockSyncMap: entity.SyncMap = {
-      provenTx: {
-        idMap: { [provenTx.provenTxId]: provenTx.provenTxId },
-        entityName: 'ProvenTx',
-        maxUpdated_at: undefined,
-        count: 1
-      },
-      transaction: {
-        idMap: {},
-        entityName: 'Transaction',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputBasket: {
-        idMap: {},
-        entityName: 'OutputBasket',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      provenTxReq: {
-        idMap: {},
-        entityName: 'ProvenTxReq',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabel: {
-        idMap: {},
-        entityName: 'TxLabel',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      txLabelMap: {
-        idMap: {},
-        entityName: 'TxLabelMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      output: {
-        idMap: {},
-        entityName: 'Output',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTag: {
-        idMap: {},
-        entityName: 'OutputTag',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      outputTagMap: {
-        idMap: {},
-        entityName: 'OutputTagMap',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificate: {
-        idMap: {},
-        entityName: 'Certificate',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      certificateField: {
-        idMap: {},
-        entityName: 'CertificateField',
-        maxUpdated_at: undefined,
-        count: 0
-      },
-      commission: {
-        idMap: {},
-        entityName: 'Commission',
-        maxUpdated_at: undefined,
-        count: 0
-      }
-    }
     const mockTrx: sdk.TrxToken = {}
 
     // Call the mergeExisting method

package/src/storage/schema/entities/__tests/SyncStateTests.test.ts

@@ -1,5 +1,11 @@
-import { SyncState } from '../../../../../src/storage/schema/entities/SyncState'
-import { entity, table, sdk } from '../../../../../src'
+import { EntitySyncState } from '../../../../../src/storage/schema/entities/SyncState'
+import {
+  createSyncMap,
+  EntityStorage,
+  sdk,
+  SyncMap,
+  TableSyncState
+} from '../../../../../src'
 import {
   TestUtilsWalletStorage as _tu,
   TestWalletNoSetup
@@ -28,7 +34,7 @@ describe('SyncState class method tests', () => {
   // Test: Insert a new SyncState when id is 0
   test('0_inserts_new_sync_state', async () => {
     const ctx = ctxs[0]
-    const syncState = new SyncState()
+    const syncState = new EntitySyncState()
     syncState.id = 0
 
     // Assign a unique value to refNum and valid userId
@@ -56,7 +62,7 @@ describe('SyncState class method tests', () => {
   // Test: Update an existing SyncState
   test('1_updates_existing_sync_state', async () => {
     const ctx = ctxs[0]
-    const syncState = new SyncState()
+    const syncState = new EntitySyncState()
     syncState.id = 0
     // Assign a unique value to refNum and valid userId
     syncState.userId = 1
@@ -83,38 +89,17 @@ describe('SyncState class method tests', () => {
 
   // Test: Merge ID maps correctly
   test('2_merges_id_maps_correctly', async () => {
-    const syncState = new SyncState()
-
-    // Complete SyncMap with all required properties
-    const inputSyncMap: entity.SyncMap = {
-      provenTx: { idMap: { 1: 2 }, entityName: 'provenTx', count: 1 },
-      outputBasket: { idMap: {}, entityName: 'outputBasket', count: 0 },
-      transaction: { idMap: { 3: 4 }, entityName: 'transaction', count: 1 },
-      provenTxReq: { idMap: {}, entityName: 'provenTxReq', count: 0 },
-      txLabel: { idMap: {}, entityName: 'txLabel', count: 0 },
-      txLabelMap: { idMap: {}, entityName: 'txLabelMap', count: 0 },
-      output: { idMap: {}, entityName: 'output', count: 0 },
-      outputTag: { idMap: {}, entityName: 'outputTag', count: 0 },
-      outputTagMap: { idMap: {}, entityName: 'outputTagMap', count: 0 },
-      certificate: { idMap: {}, entityName: 'certificate', count: 0 },
-      certificateField: { idMap: {}, entityName: 'certificateField', count: 0 },
-      commission: { idMap: {}, entityName: 'commission', count: 0 }
-    }
+    const syncState = new EntitySyncState()
 
-    syncState.syncMap = {
-      provenTx: { idMap: { 1: 2 }, entityName: 'provenTx', count: 1 },
-      outputBasket: { idMap: {}, entityName: 'outputBasket', count: 0 },
-      transaction: { idMap: { 5: 6 }, entityName: 'transaction', count: 1 },
-      provenTxReq: { idMap: {}, entityName: 'provenTxReq', count: 0 },
-      txLabel: { idMap: {}, entityName: 'txLabel', count: 0 },
-      txLabelMap: { idMap: {}, entityName: 'txLabelMap', count: 0 },
-      output: { idMap: {}, entityName: 'output', count: 0 },
-      outputTag: { idMap: {}, entityName: 'outputTag', count: 0 },
-      outputTagMap: { idMap: {}, entityName: 'outputTagMap', count: 0 },
-      certificate: { idMap: {}, entityName: 'certificate', count: 0 },
-      certificateField: { idMap: {}, entityName: 'certificateField', count: 0 },
-      commission: { idMap: {}, entityName: 'commission', count: 0 }
-    }
+    const inputSyncMap = createSyncMap()
+    inputSyncMap.provenTx.idMap = { 1: 2 }
+    inputSyncMap.transaction.idMap = { 3: 4 }
+
+    syncState.syncMap = createSyncMap()
+    syncState.syncMap.provenTx.idMap = { 1: 2 }
+    syncState.syncMap.provenTx.count = 1
+    syncState.syncMap.transaction.idMap = { 5: 6 }
+    syncState.syncMap.transaction.count = 1
 
     syncState.mergeSyncMap(inputSyncMap)
 
@@ -126,37 +111,19 @@ describe('SyncState class method tests', () => {
 
   // Test: Throw error on conflicting mappings
   test('3_throws_error_on_conflicting_mappings', () => {
-    const syncState = new SyncState()
-
-    syncState.syncMap = {
-      provenTx: { idMap: { 1: 2 }, entityName: 'provenTx', count: 1 },
-      outputBasket: { idMap: {}, entityName: 'outputBasket', count: 0 },
-      transaction: { idMap: { 3: 4 }, entityName: 'transaction', count: 1 },
-      provenTxReq: { idMap: {}, entityName: 'provenTxReq', count: 0 },
-      txLabel: { idMap: {}, entityName: 'txLabel', count: 0 },
-      txLabelMap: { idMap: {}, entityName: 'txLabelMap', count: 0 },
-      output: { idMap: {}, entityName: 'output', count: 0 },
-      outputTag: { idMap: {}, entityName: 'outputTag', count: 0 },
-      outputTagMap: { idMap: {}, entityName: 'outputTagMap', count: 0 },
-      certificate: { idMap: {}, entityName: 'certificate', count: 0 },
-      certificateField: { idMap: {}, entityName: 'certificateField', count: 0 },
-      commission: { idMap: {}, entityName: 'commission', count: 0 }
-    }
+    const syncState = new EntitySyncState()
 
-    const conflictingSyncMap: entity.SyncMap = {
-      provenTx: { idMap: { 1: 3 }, entityName: 'provenTx', count: 1 },
-      outputBasket: { idMap: {}, entityName: 'outputBasket', count: 0 },
-      transaction: { idMap: { 3: 4 }, entityName: 'transaction', count: 1 },
-      provenTxReq: { idMap: {}, entityName: 'provenTxReq', count: 0 },
-      txLabel: { idMap: {}, entityName: 'txLabel', count: 0 },
-      txLabelMap: { idMap: {}, entityName: 'txLabelMap', count: 0 },
-      output: { idMap: {}, entityName: 'output', count: 0 },
-      outputTag: { idMap: {}, entityName: 'outputTag', count: 0 },
-      outputTagMap: { idMap: {}, entityName: 'outputTagMap', count: 0 },
-      certificate: { idMap: {}, entityName: 'certificate', count: 0 },
-      certificateField: { idMap: {}, entityName: 'certificateField', count: 0 },
-      commission: { idMap: {}, entityName: 'commission', count: 0 }
-    }
+    syncState.syncMap = createSyncMap()
+    syncState.syncMap.provenTx.idMap = { 1: 2 }
+    syncState.syncMap.provenTx.count = 1
+    syncState.syncMap.transaction.idMap = { 3: 4 }
+    syncState.syncMap.transaction.count = 1
+
+    const conflictingSyncMap = createSyncMap()
+    conflictingSyncMap.provenTx.idMap = { 1: 3 }
+    conflictingSyncMap.provenTx.count = 1
+    conflictingSyncMap.transaction.idMap = { 3: 4 }
+    conflictingSyncMap.transaction.count = 1
 
     expect(() => syncState.mergeSyncMap(conflictingSyncMap)).toThrow()
   })
@@ -164,7 +131,7 @@ describe('SyncState class method tests', () => {
   // Test: Process a sync chunk correctly and update storage
   test('4_processes_sync_chunk_correctly', async () => {
     const ctx = ctxs[0]
-    const syncState = new SyncState()
+    const syncState = new EntitySyncState()
 
     // Assign a unique value to refNum and valid userId
     syncState.userId = 1
@@ -218,13 +185,13 @@ describe('SyncState class method tests', () => {
 
   // Test: equals method always returns false
   test('6_equals_method_always_returns_false', () => {
-    const syncState = new SyncState()
-    expect(syncState.equals({} as table.SyncState)).toBe(false)
+    const syncState = new EntitySyncState()
+    expect(syncState.equals({} as TableSyncState)).toBe(false)
   })
 
   // Test: Getters and setters for SyncState properties
   test('7_getters_and_setters', () => {
-    const syncState = new SyncState()
+    const syncState = new EntitySyncState()
 
     // Test created_at and updated_at
     const now = new Date()
@@ -269,7 +236,7 @@ describe('SyncState class method tests', () => {
 
   // Test: Derived properties apiErrorLocal, apiErrorOther, and apiSyncMap
   test('8_derived_properties', () => {
-    const syncState = new SyncState()
+    const syncState = new EntitySyncState()
 
     // Test apiErrorLocal and apiErrorOther
     syncState.errorLocal = {
@@ -285,35 +252,26 @@ describe('SyncState class method tests', () => {
     expect(syncState.apiErrorLocal).toBe(JSON.stringify(syncState.errorLocal))
     expect(syncState.apiErrorOther).toBe(JSON.stringify(syncState.errorOther))
 
-    // Test apiSyncMap with inline syncMap definition
-    const syncMap: entity.SyncMap = {
-      provenTx: { idMap: { 1: 2 }, entityName: 'provenTx', count: 1 },
-      outputBasket: { idMap: {}, entityName: 'outputBasket', count: 0 },
-      transaction: { idMap: { 3: 4 }, entityName: 'transaction', count: 1 },
-      provenTxReq: { idMap: {}, entityName: 'provenTxReq', count: 0 },
-      txLabel: { idMap: {}, entityName: 'txLabel', count: 0 },
-      txLabelMap: { idMap: {}, entityName: 'txLabelMap', count: 0 },
-      output: { idMap: {}, entityName: 'output', count: 0 },
-      outputTag: { idMap: {}, entityName: 'outputTag', count: 0 },
-      outputTagMap: { idMap: {}, entityName: 'outputTagMap', count: 0 },
-      certificate: { idMap: {}, entityName: 'certificate', count: 0 },
-      certificateField: { idMap: {}, entityName: 'certificateField', count: 0 },
-      commission: { idMap: {}, entityName: 'commission', count: 0 }
-    }
+    const syncMap = createSyncMap()
+    syncMap.provenTx.idMap = { 1: 2 }
+    syncMap.provenTx.count = 1
+    syncMap.transaction.idMap = { 3: 4 }
+    syncMap.transaction.count = 1
+
     syncState.syncMap = syncMap
     expect(syncState.apiSyncMap).toBe(JSON.stringify(syncMap))
   })
 
   // Test: id, entityName, and entityTable getters
   test('9_id_entityName_entityTable', () => {
-    const syncState = new SyncState()
+    const syncState = new EntitySyncState()
 
     // Test id getter and setter
     syncState.id = 42
     expect(syncState.id).toBe(42)
 
     // Test entityName
-    expect(syncState.entityName).toBe('table.SyncState')
+    expect(syncState.entityName).toBe('syncState')
 
     // Test entityTable
     expect(syncState.entityTable).toBe('sync_states')
@@ -321,23 +279,10 @@ describe('SyncState class method tests', () => {
 
   // Test: mergeNew method (does not perform any operations)
   test('10_mergeNew_does_nothing', async () => {
-    const syncState = new SyncState()
-    const mockStorage: entity.EntityStorage = {} as entity.EntityStorage
-
-    const syncMap: entity.SyncMap = {
-      provenTx: { idMap: {}, entityName: 'provenTx', count: 0 },
-      outputBasket: { idMap: {}, entityName: 'outputBasket', count: 0 },
-      transaction: { idMap: {}, entityName: 'transaction', count: 0 },
-      provenTxReq: { idMap: {}, entityName: 'provenTxReq', count: 0 },
-      txLabel: { idMap: {}, entityName: 'txLabel', count: 0 },
-      txLabelMap: { idMap: {}, entityName: 'txLabelMap', count: 0 },
-      output: { idMap: {}, entityName: 'output', count: 0 },
-      outputTag: { idMap: {}, entityName: 'outputTag', count: 0 },
-      outputTagMap: { idMap: {}, entityName: 'outputTagMap', count: 0 },
-      certificate: { idMap: {}, entityName: 'certificate', count: 0 },
-      certificateField: { idMap: {}, entityName: 'certificateField', count: 0 },
-      commission: { idMap: {}, entityName: 'commission', count: 0 }
-    }
+    const syncState = new EntitySyncState()
+    const mockStorage: EntityStorage = {} as EntityStorage
+
+    const syncMap = createSyncMap()
 
     await expect(
       syncState.mergeNew(mockStorage, 1, syncMap, undefined)
@@ -346,28 +291,15 @@ describe('SyncState class method tests', () => {
 
   // Test: mergeExisting method (always returns false)
   test('11_mergeExisting_always_returns_false', async () => {
-    const syncState = new SyncState()
-    const mockStorage: entity.EntityStorage = {} as entity.EntityStorage
-
-    const syncMap: entity.SyncMap = {
-      provenTx: { idMap: {}, entityName: 'provenTx', count: 0 },
-      outputBasket: { idMap: {}, entityName: 'outputBasket', count: 0 },
-      transaction: { idMap: {}, entityName: 'transaction', count: 0 },
-      provenTxReq: { idMap: {}, entityName: 'provenTxReq', count: 0 },
-      txLabel: { idMap: {}, entityName: 'txLabel', count: 0 },
-      txLabelMap: { idMap: {}, entityName: 'txLabelMap', count: 0 },
-      output: { idMap: {}, entityName: 'output', count: 0 },
-      outputTag: { idMap: {}, entityName: 'outputTag', count: 0 },
-      outputTagMap: { idMap: {}, entityName: 'outputTagMap', count: 0 },
-      certificate: { idMap: {}, entityName: 'certificate', count: 0 },
-      certificateField: { idMap: {}, entityName: 'certificateField', count: 0 },
-      commission: { idMap: {}, entityName: 'commission', count: 0 }
-    }
+    const syncState = new EntitySyncState()
+    const mockStorage: EntityStorage = {} as EntityStorage
+
+    const syncMap = createSyncMap()
 
     const result = await syncState.mergeExisting(
       mockStorage,
       new Date(),
-      {} as table.SyncState,
+      {} as TableSyncState,
       syncMap,
       undefined
     )