Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/DPP-1 #119

Merged
merged 37 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
40da447
DPP-1 WIP
Brummos Jul 30, 2023
728be58
DPP-1 WIP
Brummos Jul 30, 2023
203d050
DPP-1 WIP
Brummos Aug 1, 2023
34aa250
DPP-1 WIP
Brummos Aug 1, 2023
b105d31
DPP-1 migrations WIP
Brummos Aug 2, 2023
31c67ef
DPP-1 WIP
Brummos Aug 3, 2023
7c2d544
DPP-1 WIP
Brummos Aug 3, 2023
f82ebb2
DPP-1 added index name
Brummos Aug 3, 2023
ff03e38
DPP-1 refactor work
Brummos Aug 30, 2023
8e37954
DPP-1 cleanup
Brummos Aug 30, 2023
a939ff5
DPP-1 sqlite up migrations
Brummos Sep 4, 2023
1d54145
DPP-1 postgres migration constraint name fix
Brummos Sep 4, 2023
02cc4f3
DPP-1 postgres migration WIP
Brummos Sep 4, 2023
750b78f
DPP-1 postgres migration WIP
Brummos Sep 4, 2023
1a29516
DPP-1 postgres migration WIP
Brummos Sep 4, 2023
8843354
DPP-1 postgres migration WIP
Brummos Sep 4, 2023
8069fe9
DPP-1 postgres migration WIP
Brummos Sep 4, 2023
deb73c7
DPP-1 postgres migration WIP
Brummos Sep 4, 2023
576bf9b
DPP-1 postgres migration WIP
Brummos Sep 4, 2023
76dcce2
DPP-1 migration WIP
Brummos Sep 4, 2023
ad889d8
DPP-1 sqlite migration constraint names
Brummos Sep 4, 2023
f52c2ec
DPP-1 postgres migration constraint names
Brummos Sep 4, 2023
49fccef
DPP-1 postgres identity relation migration fix
Brummos Sep 4, 2023
60decd8
DPP-1 migration nameing fix
Brummos Sep 5, 2023
aa38fc1
DPP-1 test cleanup
Brummos Sep 5, 2023
05d6cc5
DPP-1 cleanup
Brummos Sep 5, 2023
4c4216b
DPP-1 cleanup
Brummos Sep 5, 2023
78b58e5
DPP-1 cleanup
Brummos Sep 5, 2023
7f34679
DPP-1 cleanup
Brummos Sep 5, 2023
fc3949b
Merge branch 'develop' into feature/DPP-1
Brummos Sep 5, 2023
321ea76
DPP-1 lock file update
Brummos Sep 5, 2023
6109ded
Merge branch 'develop' into feature/DPP-1
Brummos Sep 12, 2023
28ee8b2
DPP-1 migration uuid fix
Brummos Sep 12, 2023
c485e7f
DPP-1 pnpm lock
Brummos Sep 12, 2023
8422945
DPP-1 formatting fix
Brummos Sep 12, 2023
dd09f38
DPP-1 test fix
Brummos Sep 12, 2023
7ed1d99
DPP-1 test fixes
Brummos Sep 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/contact-manager/__tests__/localAgent.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { createObjects, getConfig } from '../../agent-config/dist'
import { Connection } from 'typeorm'
import { DataSource } from 'typeorm'

jest.setTimeout(30000)

import contactManagerAgentLogic from './shared/contactManagerAgentLogic'

let dbConnection: Promise<Connection>
let dbConnection: Promise<DataSource>
let agent: any

const setup = async (): Promise<boolean> => {
Expand All @@ -29,6 +29,6 @@ const testContext = {
tearDown,
}

describe('Local integration tests', () => {
describe('Local integration tests', (): void => {
contactManagerAgentLogic(testContext)
})
14 changes: 7 additions & 7 deletions packages/contact-manager/__tests__/restAgent.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'cross-fetch/polyfill'
// @ts-ignore
import express from 'express'
import express, { Router } from 'express'
import { Server } from 'http'
import { Connection } from 'typeorm'
import { DataSource } from 'typeorm'
import { IAgent, createAgent, IAgentOptions } from '@veramo/core'
import { AgentRestClient } from '@veramo/remote-client'
import { AgentRouter, RequestWithAgentRouter } from '@veramo/remote-server'
Expand All @@ -17,7 +17,7 @@ const basePath = '/agent'

let serverAgent: IAgent
let restServer: Server
let dbConnection: Promise<Connection>
let dbConnection: Promise<DataSource>

const getAgent = (options?: IAgentOptions) =>
createAgent<IContactManager>({
Expand All @@ -41,14 +41,14 @@ const setup = async (): Promise<boolean> => {
exposedMethods: serverAgent.availableMethods(),
})

const requestWithAgent = RequestWithAgentRouter({
const requestWithAgent: Router = RequestWithAgentRouter({
agent: serverAgent,
})

return new Promise((resolve) => {
return new Promise((resolve): void => {
const app = express()
app.use(basePath, requestWithAgent, agentRouter)
restServer = app.listen(port, () => {
restServer = app.listen(port, (): void => {
resolve(true)
})
})
Expand All @@ -66,6 +66,6 @@ const testContext = {
tearDown,
}

describe('REST integration tests', () => {
describe('REST integration tests', (): void => {
contactManagerAgentLogic(testContext)
})
Loading