feat(2756): add test cases for liquidity and settlement account creat…

…ion.
interledger · Jun 18, 2024 · 8572518 · 8572518
1 parent 87f39a2
commit 8572518
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 33 deletions.
diff --git a/packages/backend/src/accounting/psql/service.ts b/packages/backend/src/accounting/psql/service.ts
@@ -33,7 +33,7 @@ import {
   voidTransfers
 } from './ledger-transfer'
 import { LedgerTransfer, LedgerTransferType } from './ledger-transfer/model'
-import { AccountId } from '../tigerbeetle/utils'
+import { AccountId, AccountUserData128 } from '../tigerbeetle/utils'
 
 export interface ServiceDependencies extends BaseService {
   knex: TransactionOrKnex
@@ -52,17 +52,11 @@ export function createAccountingService(
       createLiquidityAccount(deps, options, accTypeCode, trx),
     createSettlementAccount: (ledger, accountId, trx) =>
       createSettlementAccount(deps, ledger, accountId, trx),
-    createLiquidityAndLinkedSettlementAccount: (
-      options,
-      accTypeCode,
-      ledger,
-      trx
-    ) =>
+    createLiquidityAndLinkedSettlementAccount: (options, accTypeCode, trx) =>
       createLiquidityAndLinkedSettlementAccount(
         deps,
         options,
         accTypeCode,
-        ledger,
         trx
       ),
     getBalance: (accountRef) => getLiquidityAccountBalance(deps, accountRef),
@@ -102,7 +96,7 @@ export async function createLiquidityAccount(
 export async function createSettlementAccount(
   deps: ServiceDependencies,
   ledger: number,
-  accountId: AccountId,
+  accountId: AccountUserData128,
   trx?: TransactionOrKnex
 ): Promise<void> {
   const asset = await Asset.query(trx || deps.knex).findOne({ ledger })
@@ -125,11 +119,10 @@ export async function createLiquidityAndLinkedSettlementAccount(
   deps: ServiceDependencies,
   account: LiquidityAccount,
   accountType: LiquidityAccountType,
-  ledger: number,
   trx?: TransactionOrKnex
 ): Promise<LiquidityAccount> {
   await createLiquidityAccount(deps, account, accountType, trx)
-  await createSettlementAccount(deps, ledger, account.id, trx)
+  await createSettlementAccount(deps, account.asset.ledger, account.id, trx)
   return account
 }
 

diff --git a/packages/backend/src/accounting/service.ts b/packages/backend/src/accounting/service.ts
@@ -1,7 +1,7 @@
 import { TransactionOrKnex } from 'objection'
 import { BaseService } from '../shared/baseService'
 import { TransferError, isTransferError } from './errors'
-import { AccountId } from './tigerbeetle/utils'
+import { AccountUserData128 } from './tigerbeetle/utils'
 
 export enum LiquidityAccountType {
   ASSET = 'ASSET',
@@ -66,13 +66,12 @@ export interface AccountingService {
   ): Promise<LiquidityAccount>
   createSettlementAccount(
     ledger: number,
-    accountId: AccountId,
+    accountId: AccountUserData128,
     trx?: TransactionOrKnex
   ): Promise<void>
   createLiquidityAndLinkedSettlementAccount(
     account: LiquidityAccount,
     accountType: LiquidityAccountType,
-    ledger: number,
     trx?: TransactionOrKnex
   ): Promise<LiquidityAccount>
   getBalance(id: string): Promise<bigint | undefined>

diff --git a/packages/backend/src/accounting/tigerbeetle/accounts.ts b/packages/backend/src/accounting/tigerbeetle/accounts.ts
@@ -6,14 +6,14 @@ import {
 
 import { ServiceDependencies, TigerBeetleAccountCode } from './service'
 import { TigerbeetleCreateAccountError } from './errors'
-import { AccountId, toTigerbeetleId, UserData128 } from './utils'
+import { AccountId, toTigerbeetleId, AccountUserData128 } from './utils'
 
 export interface CreateAccountOptions {
   id: AccountId
   ledger: number
   code: TigerBeetleAccountCode
   linked: boolean
-  userData128: UserData128
+  userData128: AccountUserData128
 }
 
 export async function createAccounts(

diff --git a/packages/backend/src/accounting/tigerbeetle/service.test.ts b/packages/backend/src/accounting/tigerbeetle/service.test.ts
@@ -120,6 +120,30 @@ describe('TigerBeetle Accounting Service', (): void => {
     })
   })
 
+  describe('Create Liquidity and Settlement Account - Linked', (): void => {
+    test('Can create a liquidity and settlement account', async (): Promise<void> => {
+      const account: LiquidityAccount = {
+        id: uuid(),
+        asset: {
+          id: uuid(),
+          ledger: newLedger()
+        }
+      }
+      await expect(
+        accountingService.createLiquidityAndLinkedSettlementAccount(
+          account,
+          LiquidityAccountType.ASSET
+        )
+      ).resolves.toEqual(account)
+      await expect(accountingService.getBalance(account.id)).resolves.toEqual(
+        BigInt(0)
+      )
+      await expect(
+        accountingService.getSettlementBalance(account.asset.ledger)
+      ).resolves.toEqual(BigInt(0))
+    })
+  })
+
   describe('Get Account Balance', (): void => {
     test("Can retrieve an account's balance", async (): Promise<void> => {
       const { id } = await accountFactory.build()

diff --git a/packages/backend/src/accounting/tigerbeetle/service.ts b/packages/backend/src/accounting/tigerbeetle/service.ts
@@ -25,7 +25,7 @@ import {
   areAllAccountExistsErrors
 } from './errors'
 import { NewTransferOptions, createTransfers } from './transfers'
-import { AccountId, toTigerbeetleId } from './utils'
+import { AccountUserData128, toTigerbeetleId } from './utils'
 
 export enum TigerBeetleAccountCode {
   LIQUIDITY_WEB_MONETIZATION = 1,
@@ -76,13 +76,8 @@ export function createAccountingService(
       createLiquidityAccount(deps, options, accountType),
     createSettlementAccount: (ledger, accountId) =>
       createSettlementAccount(deps, ledger, accountId),
-    createLiquidityAndLinkedSettlementAccount: (options, accTypeCode, ledger) =>
-      createLiquidityAndLinkedSettlementAccount(
-        deps,
-        options,
-        accTypeCode,
-        ledger
-      ),
+    createLiquidityAndLinkedSettlementAccount: (options, accTypeCode) =>
+      createLiquidityAndLinkedSettlementAccount(deps, options, accTypeCode),
     getBalance: (id) => getAccountBalance(deps, id),
     getTotalSent: (id) => getAccountTotalSent(deps, id),
     getAccountsTotalSent: (ids) => getAccountsTotalSent(deps, ids),
@@ -130,7 +125,7 @@ export async function createLiquidityAccount(
 export async function createSettlementAccount(
   deps: ServiceDependencies,
   ledger: number,
-  accountId: AccountId
+  accountId: AccountUserData128
 ): Promise<void> {
   try {
     await createAccounts(deps, [
@@ -158,8 +153,7 @@ export async function createSettlementAccount(
 export async function createLiquidityAndLinkedSettlementAccount(
   deps: ServiceDependencies,
   account: LiquidityAccount,
-  accountType: LiquidityAccountType,
-  ledger: number
+  accountType: LiquidityAccountType
 ): Promise<LiquidityAccount> {
   if (!validateId(account.id)) {
     throw new Error('unable to create account, invalid id')
@@ -175,8 +169,8 @@ export async function createLiquidityAndLinkedSettlementAccount(
         userData128: account.asset.id
       },
       {
-        id: ledger,
-        ledger,
+        id: account.asset.ledger,
+        ledger: account.asset.ledger,
         code: TigerBeetleAccountCode.SETTLEMENT,
         linked: false,
         userData128: account.asset.id

diff --git a/packages/backend/src/accounting/tigerbeetle/utils.ts b/packages/backend/src/accounting/tigerbeetle/utils.ts
@@ -1,7 +1,7 @@
 import { validateId } from '../../shared/utils'
 
 export type AccountId = string | number | bigint
-export type UserData128 = AccountId
+export type AccountUserData128 = AccountId
 
 export function toTigerbeetleId(id: AccountId): bigint {
   if (typeof id === 'number') {

diff --git a/packages/backend/src/asset/service.ts b/packages/backend/src/asset/service.ts
@@ -100,7 +100,6 @@ async function createAsset(
       await deps.accountingService.createLiquidityAndLinkedSettlementAccount(
         asset,
         LiquidityAccountType.ASSET,
-        asset.ledger,
         trx
       )
       return asset

diff --git a/packages/backend/src/payment-method/ilp/connector/core/test/mocks/accounting-service.ts b/packages/backend/src/payment-method/ilp/connector/core/test/mocks/accounting-service.ts
@@ -12,7 +12,7 @@ import {
 } from '../../../../../../accounting/errors'
 import { CreateAccountError as CreateAccountErrorCode } from 'tigerbeetle-node'
 import { TransactionOrKnex } from 'objection'
-import { AccountId } from '../../../../../../accounting/tigerbeetle/utils'
+import { AccountUserData128 } from '../../../../../../accounting/tigerbeetle/utils'
 
 interface MockAccount {
   id: string
@@ -150,7 +150,7 @@ export class MockAccountingService implements AccountingService {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ledger: number,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    accountId: AccountId,
+    accountId: AccountUserData128,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     trx?: TransactionOrKnex
   ): Promise<void> {