@bsv/wallet-toolbox 1.1.2 → 1.1.4

package/test/utils/TestUtilsWalletStorage.ts

@@ -438,6 +438,19 @@ export abstract class TestUtilsWalletStorage {
     })
   }
 
+  static async createMySQLTestSetup2Wallet(args: {
+    databaseName: string
+    mockData: MockData
+    chain?: sdk.Chain
+    rootKeyHex?: string
+  }): Promise<TestWallet<TestSetup2>> {
+    return await this.createKnexTestSetup2Wallet({
+      ...args,
+      dropAll: true,
+      knex: _tu.createLocalMySQL(args.databaseName)
+    })
+  }
+
   static async createSQLiteTestWallet(args: {
     filePath?: string
     databaseName: string
@@ -475,6 +488,7 @@ export abstract class TestUtilsWalletStorage {
 
   static async createSQLiteTestSetup2Wallet(args: {
     databaseName: string
+    mockData: MockData
     chain?: sdk.Chain
     rootKeyHex?: string
   }): Promise<TestWallet<TestSetup2>> {
@@ -521,13 +535,16 @@ export abstract class TestUtilsWalletStorage {
   static async createKnexTestSetup2Wallet(args: {
     knex: Knex<any, any[]>
     databaseName: string
+    mockData: MockData
     chain?: sdk.Chain
     rootKeyHex?: string
     dropAll?: boolean
   }): Promise<TestWallet<TestSetup2>> {
     return await _tu.createKnexTestWalletWithSetup({
       ...args,
-      insertSetup: _tu.createTestSetup2
+      insertSetup: async (storage: StorageKnex, identityKey: string) => {
+        return _tu.createTestSetup2(storage, identityKey, args.mockData)
+      }
     })
   }
 
@@ -1145,7 +1162,7 @@ export abstract class TestUtilsWalletStorage {
 
   static async createTestSetup2(
     storage: StorageProvider,
-    u1IdentityKey: string,
+    identityKey: string,
     mockData: MockData = { actions: [] }
   ): Promise<TestSetup2> {
     if (!mockData || !mockData.actions) {
@@ -1157,7 +1174,7 @@ export abstract class TestUtilsWalletStorage {
     const outputMap: Record<string, any> = {}
 
     // only one user
-    const user = await _tu.insertTestUser(storage, u1IdentityKey)
+    const user = await _tu.insertTestUser(storage, identityKey)
 
     // First create your output that represent your inputs
     for (const action of mockData.actions) {
@@ -1328,7 +1345,7 @@ export abstract class TestUtilsWalletStorage {
       }
     }
 
-    return {}
+    return mockData
   }
 
   static mockPostServicesAsSuccess(ctxs: TestWalletOnly[]): void {
@@ -1411,7 +1428,7 @@ export interface MockData {
   actions: WalletAction[]
 }
 
-export interface TestSetup2 {}
+export interface TestSetup2 extends MockData {}
 
 export interface TestWallet<T> extends TestWalletOnly {
   activeStorage: StorageKnex
@@ -1446,6 +1463,7 @@ async function insertEmptySetup(
   return {}
 }
 
+export type TestSetup2Wallet = TestWallet<TestSetup2>
 export type TestSetup1Wallet = TestWallet<TestSetup1>
 export type TestWalletNoSetup = TestWallet<{}>
 

package/test/wallet/list/listActions2.test.ts

@@ -10,95 +10,67 @@ import {
   TestWalletNoSetup
 } from '../../utils/TestUtilsWalletStorage'
 
-const testName = 'listActions'
+const env = _tu.getEnv('test')
+const testName = () => expect.getState().currentTestName || 'test'
 
-describe('listActions single action tests', () => {
+describe('listActions2 single action tests', () => {
   jest.setTimeout(99999999)
 
-  let ctxs: TestWalletNoSetup[] = []
-  let setups: { setup: TestSetup2; storage: StorageProvider }[] = []
+  let ctxs: TestWalletNoSetup[]
 
-  const env = _tu.getEnv('test')
-  const testName = () => expect.getState().currentTestName || 'test'
+  const mockData: MockData = {
+    actions: [
+      {
+        txid: 'tx',
+        satoshis: 1,
+        status: 'completed',
+        isOutgoing: true,
+        description: 'Transaction',
+        version: 1,
+        lockTime: 0,
+        labels: ['label', 'label2'],
+        inputs: [
+          {
+            sourceOutpoint: 'tx.0',
+            sourceSatoshis: 1,
+            sourceLockingScript: '0123456789abcdef',
+            unlockingScript: '0123456789abcdef',
+            inputDescription: 'description',
+            sequenceNumber: 0
+          }
+        ],
+        outputs: [
+          {
+            satoshis: 1,
+            spendable: false,
+            tags: ['tag', 'tag2'],
+            outputIndex: 2,
+            outputDescription: 'description',
+            basket: 'basket',
+            lockingScript: '0123456789abcdef'
+          }
+        ]
+      }
+    ]
+  }
 
   beforeEach(async () => {
-    setups = []
-    ctxs = []
-
-    await Promise.all(
-      ctxs.map(async ctx => {
-        await ctx.storage.destroy()
-      })
-    )
     ctxs = []
-
-    if (env.runMySQL) {
-      ctxs.push(await _tu.createLegacyWalletMySQLCopy(testName))
-    }
-    await _tu.createSQLiteTestWallet({
+    const args = {
       chain: 'test',
+      mockData,
       databaseName: testName(),
       rootKeyHex: '2'.repeat(64),
       dropAll: true
-    })
-
-    //ctxs.push(await _tu.createLegacyWalletSQLiteCopy(testName))
-
-    const mockData: MockData = {
-      actions: [
-        {
-          txid: 'tx',
-          satoshis: 1,
-          status: 'completed',
-          isOutgoing: true,
-          description: 'Transaction',
-          version: 1,
-          lockTime: 0,
-          labels: ['label', 'label2'],
-          inputs: [
-            {
-              sourceOutpoint: 'tx.0',
-              sourceSatoshis: 1,
-              sourceLockingScript: '0123456789abcdef',
-              unlockingScript: '0123456789abcdef',
-              inputDescription: 'description',
-              sequenceNumber: 0
-            }
-          ],
-          outputs: [
-            {
-              satoshis: 1,
-              spendable: false,
-              tags: ['tag', 'tag2'],
-              outputIndex: 2,
-              outputDescription: 'description',
-              basket: 'basket',
-              lockingScript: '0123456789abcdef'
-            }
-          ]
-        }
-      ]
-    }
-
-    for (const ctx of ctxs) {
-      const { activeStorage } = ctx
-      await activeStorage.dropAllData()
-      await activeStorage.migrate('insert tests', '3'.repeat(64))
     }
-    expect(setups).toBeTruthy()
-
-    for (const { activeStorage: storage, identityKey } of ctxs) {
-      await _tu.createTestSetup2(storage, identityKey, mockData)
+    if (env.runMySQL) {
+      ctxs.push(await _tu.createMySQLTestSetup2Wallet(args))
     }
+    ctxs.push(await _tu.createSQLiteTestSetup2Wallet(args))
   })
 
   afterEach(async () => {
-    await Promise.all(
-      ctxs.map(async ctx => {
-        await ctx.storage.destroy()
-      })
-    )
-    ctxs = []
+    for (const { wallet } of ctxs) await wallet.destroy()
   })
 
   test('12_no labels default any', async () => {
@@ -1196,121 +1168,95 @@ describe('listActions single action tests', () => {
   // })
 })
 
-describe('listActions two action tests', () => {
+describe('listActions2 two action tests', () => {
   jest.setTimeout(99999999)
 
-  let ctxs: TestWalletNoSetup[] = []
-  let setups: { setup: TestSetup2; storage: StorageProvider }[] = []
+  let ctxs: TestWalletNoSetup[]
 
-  const env = _tu.getEnv('test')
-  const testName = () => expect.getState().currentTestName || 'test'
+  const mockData: MockData = {
+    actions: [
+      {
+        txid: 'tx1',
+        satoshis: 1,
+        status: 'completed',
+        isOutgoing: true,
+        description: 'Transaction 1',
+        version: 1,
+        lockTime: 0,
+        labels: ['label 1', 'label a'],
+        inputs: [
+          {
+            sourceOutpoint: 'tx1.1',
+            sourceSatoshis: 1,
+            //sourceLockingScript: '0123456789abcdef',
+            //unlockingScript: '0123456789abcdef',
+            inputDescription: 'description 1',
+            sequenceNumber: 1
+          }
+        ],
+        outputs: [
+          {
+            satoshis: 1,
+            spendable: false,
+            tags: ['tag1'],
+            outputIndex: 1,
+            outputDescription: 'description 1',
+            basket: 'basket'
+            //lockingScript: '0123456789abcdef'
+          }
+        ]
+      },
+      {
+        txid: 'tx2',
+        satoshis: 2,
+        status: 'completed',
+        isOutgoing: true,
+        description: 'Transaction 2',
+        version: 1,
+        lockTime: 0,
+        labels: ['label2', 'label b'],
+        inputs: [
+          {
+            sourceOutpoint: 'tx2.2',
+            sourceSatoshis: 2,
+            //sourceLockingScript: '0123456789abcdef',
+            //unlockingScript: '0123456789abcdef',
+            inputDescription: 'description 2',
+            sequenceNumber: 2
+          }
+        ],
+        outputs: [
+          {
+            satoshis: 2,
+            spendable: false,
+            tags: ['tag2'],
+            outputIndex: 2,
+            outputDescription: 'description 2',
+            basket: 'basket 2'
+            //lockingScript: '0123456789abcdef'
+          }
+        ]
+      }
+    ]
+  }
 
   beforeEach(async () => {
-    setups = []
     ctxs = []
-
-    await Promise.all(
-      ctxs.map(async ctx => {
-        await ctx.storage.destroy()
-      })
-    )
-    ctxs = []
-
-    if (env.runMySQL) {
-      ctxs.push(await _tu.createLegacyWalletMySQLCopy(testName))
-    }
-    await _tu.createSQLiteTestWallet({
+    const args = {
       chain: 'test',
+      mockData,
       databaseName: testName(),
       rootKeyHex: '2'.repeat(64),
       dropAll: true
-    })
-
-    const mockData: MockData = {
-      actions: [
-        {
-          txid: 'tx1',
-          satoshis: 1,
-          status: 'completed',
-          isOutgoing: true,
-          description: 'Transaction 1',
-          version: 1,
-          lockTime: 0,
-          labels: ['label 1', 'label a'],
-          inputs: [
-            {
-              sourceOutpoint: 'tx1.1',
-              sourceSatoshis: 1,
-              //sourceLockingScript: '0123456789abcdef',
-              //unlockingScript: '0123456789abcdef',
-              inputDescription: 'description 1',
-              sequenceNumber: 1
-            }
-          ],
-          outputs: [
-            {
-              satoshis: 1,
-              spendable: false,
-              tags: ['tag1'],
-              outputIndex: 1,
-              outputDescription: 'description 1',
-              basket: 'basket'
-              //lockingScript: '0123456789abcdef'
-            }
-          ]
-        },
-        {
-          txid: 'tx2',
-          satoshis: 2,
-          status: 'completed',
-          isOutgoing: true,
-          description: 'Transaction 2',
-          version: 1,
-          lockTime: 0,
-          labels: ['label2', 'label b'],
-          inputs: [
-            {
-              sourceOutpoint: 'tx2.2',
-              sourceSatoshis: 2,
-              //sourceLockingScript: '0123456789abcdef',
-              //unlockingScript: '0123456789abcdef',
-              inputDescription: 'description 2',
-              sequenceNumber: 2
-            }
-          ],
-          outputs: [
-            {
-              satoshis: 2,
-              spendable: false,
-              tags: ['tag2'],
-              outputIndex: 2,
-              outputDescription: 'description 2',
-              basket: 'basket 2'
-              //lockingScript: '0123456789abcdef'
-            }
-          ]
-        }
-      ]
     }
-    for (const ctx of ctxs) {
-      const { activeStorage } = ctx
-      await activeStorage.dropAllData()
-      await activeStorage.migrate('insert tests', '3'.repeat(64))
-    }
-    expect(setups).toBeTruthy()
-
-    for (const { activeStorage: storage, identityKey } of ctxs) {
-      await _tu.createTestSetup2(storage, identityKey, mockData)
+    if (env.runMySQL) {
+      ctxs.push(await _tu.createMySQLTestSetup2Wallet(args))
     }
+    ctxs.push(await _tu.createSQLiteTestSetup2Wallet(args))
   })
 
   afterEach(async () => {
-    await Promise.all(
-      ctxs.map(async ctx => {
-        await ctx.storage.destroy()
-      })
-    )
-    ctxs = []
+    for (const { wallet } of ctxs) await wallet.destroy()
   })
 
   test('100_no labels (default) matched default any', async () => {

package/ts2md.json

@@ -1,5 +1,11 @@
 {
   "options": [
+    {
+      "inputFilename": "src/index.ts",
+      "outputFilename": "docs/setup.md",
+      "firstHeadingLevel": 1,
+      "filenameSubString": "Setup"
+    },
     {
       "inputFilename": "src/index.ts",
       "outputFilename": "docs/monitor.md",