diff --git a/infrastructure/helm/tigerbeetle/values.yaml b/infrastructure/helm/tigerbeetle/values.yaml index 6f7fa38c86..fe6e32bfac 100644 --- a/infrastructure/helm/tigerbeetle/values.yaml +++ b/infrastructure/helm/tigerbeetle/values.yaml @@ -23,10 +23,10 @@ statefulset: clusterId: "0" image: - repository: ghcr.io/tigerbeetledb/tigerbeetle@sha256 + repository: ghcr.io/tigerbeetledb/tigerbeetle pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "3e2954cba78e17db42013e56fd9850a6047f7caa6f30dd7c46ff932c809af10c" + tag: "0.13.38" proxyImage: repository: nginx diff --git a/jest.config.base.js b/jest.config.base.js index 39c2c9fe4a..a2a87386ce 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -6,5 +6,6 @@ module.exports = { }, testEnvironment: 'node', moduleDirectories: ['node_modules', './'], - modulePaths: ['node_modules', './'] + modulePaths: ['node_modules', './'], + workerThreads: true } diff --git a/localenv/tigerbeetle/docker-compose.yml b/localenv/tigerbeetle/docker-compose.yml index bc424a7a75..18b4a8b29c 100644 --- a/localenv/tigerbeetle/docker-compose.yml +++ b/localenv/tigerbeetle/docker-compose.yml @@ -2,7 +2,7 @@ services: tigerbeetle: env_file: - ../tigerbeetle/.env.tigerbeetle - image: ghcr.io/tigerbeetledb/tigerbeetle@sha256:3e2954cba78e17db42013e56fd9850a6047f7caa6f30dd7c46ff932c809af10c + image: ghcr.io/tigerbeetle/tigerbeetle:0.13.38 privileged: true volumes: - tigerbeetle-data:/var/lib/tigerbeetle diff --git a/packages/auth/src/grant/service.test.ts b/packages/auth/src/grant/service.test.ts index fdf2f08039..9b03dec954 100644 --- a/packages/auth/src/grant/service.test.ts +++ b/packages/auth/src/grant/service.test.ts @@ -288,15 +288,23 @@ describe('Grant Service', (): void => { }) describe('getGrantsPage', (): void => { - let grants: Grant[] | undefined + let grants: Grant[] = [] const paymentPointer = 'example.com/test' + beforeEach(async () => { - grants = await Promise.all( - [paymentPointer, paymentPointer, 'example.com/test3'].map( - async (identifier) => createGrant(deps, identifier) - ) - ) + for (const identifier of [ + paymentPointer, + paymentPointer, + 'example.com/test3' + ]) { + grants.push(await createGrant(deps, { identifier })) + } }) + + afterEach(async () => { + grants = [] + }) + test('No filter gets all', async (): Promise => { const grants = await grantService.getPage() const allGrants = await Grant.query() diff --git a/packages/auth/src/graphql/resolvers/grant.test.ts b/packages/auth/src/graphql/resolvers/grant.test.ts index 383c0b407b..6d1c76ddc0 100644 --- a/packages/auth/src/graphql/resolvers/grant.test.ts +++ b/packages/auth/src/graphql/resolvers/grant.test.ts @@ -89,7 +89,7 @@ describe('Grant Resolvers', (): void => { const grants: GrantModel[] = [] const identifier = 'https://example.com/test' for (let i = 0; i < 2; i++) { - const grant = await createGrant(deps, identifier) + const grant = await createGrant(deps, { identifier }) grants.push(grant) } diff --git a/packages/auth/src/tests/grant.ts b/packages/auth/src/tests/grant.ts index 4b33c0ff57..4cd8a27027 100644 --- a/packages/auth/src/tests/grant.ts +++ b/packages/auth/src/tests/grant.ts @@ -1,5 +1,4 @@ import { faker } from '@faker-js/faker' -import { v4 as uuid } from 'uuid' import { FinishMethod, Grant, StartMethod } from '../grant/model' import { generateNonce } from '../shared/utils' import { AccessAction, AccessType } from '@interledger/open-payments' @@ -8,13 +7,13 @@ import { AppServices } from '../app' export async function createGrant( deps: IocContract, - identifier?: string + options?: { identifier?: string } ): Promise { const grantService = await deps.use('grantService') const CLIENT = faker.internet.url({ appendSlash: false }) const BASE_GRANT_ACCESS = { actions: [AccessAction.Create, AccessAction.Read, AccessAction.List], - identifier: identifier ?? `https://example.com/${uuid()}` + identifier: options?.identifier } const BASE_GRANT_REQUEST = { diff --git a/packages/backend/package.json b/packages/backend/package.json index ae532f6022..eba4de4eab 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -86,7 +86,7 @@ "pino": "^8.14.1", "pino-pretty": "^10.0.0", "raw-body": "^2.5.2", - "tigerbeetle-node": "^0.12.76", + "tigerbeetle-node": "^0.13.38", "token-introspection": "workspace:../token-introspection", "uuid": "^9.0.0" } diff --git a/packages/backend/src/tests/tigerbeetle.ts b/packages/backend/src/tests/tigerbeetle.ts index 9a1eecb45e..eecd9674b1 100644 --- a/packages/backend/src/tests/tigerbeetle.ts +++ b/packages/backend/src/tests/tigerbeetle.ts @@ -15,10 +15,9 @@ export async function startTigerbeetleContainer(clusterId?: number): Promise<{ const tigerbeetleClusterId = clusterId || Config.tigerbeetleClusterId const { name: tigerbeetleDir } = tmp.dirSync({ unsafeCleanup: true }) const tigerbeetleFile = `cluster_${tigerbeetleClusterId}_replica_0_test.tigerbeetle` + const tigerbeetleContainerVersion = 'ghcr.io/tigerbeetle/tigerbeetle:0.13.38' - const tbContFormat = await new GenericContainer( - 'ghcr.io/tigerbeetledb/tigerbeetle@sha256:3e2954cba78e17db42013e56fd9850a6047f7caa6f30dd7c46ff932c809af10c' - ) + const tbContFormat = await new GenericContainer(tigerbeetleContainerVersion) .withExposedPorts(TIGERBEETLE_PORT) .withBindMounts([ { @@ -49,9 +48,7 @@ export async function startTigerbeetleContainer(clusterId?: number): Promise<{ .on('end', () => console.log('Stream closed for [tb-format]')) } - const tbContStart = await new GenericContainer( - 'ghcr.io/tigerbeetledb/tigerbeetle@sha256:3e2954cba78e17db42013e56fd9850a6047f7caa6f30dd7c46ff932c809af10c' - ) + const tbContStart = await new GenericContainer(tigerbeetleContainerVersion) .withExposedPorts(TIGERBEETLE_PORT) .withBindMounts([ { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 494e7ac5b7..687d488048 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -423,8 +423,8 @@ importers: specifier: ^2.5.2 version: 2.5.2 tigerbeetle-node: - specifier: ^0.12.76 - version: 0.12.76 + specifier: ^0.13.38 + version: 0.13.38 token-introspection: specifier: workspace:../token-introspection version: link:../token-introspection @@ -17716,8 +17716,8 @@ packages: resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==} dev: false - /tigerbeetle-node@0.12.76: - resolution: {integrity: sha512-RdKd9eud05BsJDIAYbiLCfM65gPOQaElAkj/+uNqpsGhlpPdgemMZ1gf2QqGRD0hvqvV2zsjXjtu3MHJ0ZvgsQ==} + /tigerbeetle-node@0.13.38: + resolution: {integrity: sha512-00pscjiYnEbtmVvMuNCvKo6drchYjBCbSjNIndfga/YKQTWDXozl5Tn2wfR1O7Qa9WlIp0JrXowOj1nHh6//tA==} engines: {node: '>=14.0.0'} dev: false