decentralized-identity · mirceanis · Jul 28, 2022 · Jul 28, 2022
diff --git a/__tests__/initial.migration.test.ts b/__tests__/initial.migration.test.ts
@@ -1,3 +1,5 @@
+// noinspection ES6PreferShortImport
+
 /**
  * This suite runs through a few agent operations using data that was created before
  * TypeORM migrations were available (before Veramo 3.0.0)
@@ -32,7 +34,7 @@ import { KeyManager } from '../packages/key-manager/src'
 import { DIDManager } from '../packages/did-manager/src'
 import { FakeDidProvider, FakeDidResolver } from '../packages/test-utils/src'
 
-import { Connection, ConnectionOptions, createConnection } from 'typeorm'
+import { DataSourceOptions, DataSource } from 'typeorm'
 import { Resolver } from 'did-resolver'
 import { getResolver as ethrDidResolver } from 'ethr-did-resolver'
 import { getResolver as webDidResolver } from 'web-did-resolver'
@@ -58,18 +60,19 @@ describe('database initial migration tests', () => {
 
   function createTestsUsingOptions(
     databaseBeforeFile: string,
-    connectionOverrides: Partial<ConnectionOptions>,
+    connectionOverrides: Partial<DataSourceOptions>,
   ) {
     describe('using pre-migration database fixture', () => {
       const databaseFile = databaseBeforeFile + '.tmp'
       type TestingAgentPlugins = IDIDManager & IKeyManager & IDataStore & IDataStoreORM & IResolver & IDIDComm
       let agent: TAgent<TestingAgentPlugins>
-      let dbConnection: Promise<Connection>
+      let dbConnection: DataSource
 
       beforeAll(async () => {
         fs.copyFileSync(databaseBeforeFile, databaseFile)
 
-        dbConnection = createConnection({
+        // intentionally using DataSource instead of Promise<DataSource> to test compatibility
+        dbConnection = new DataSource({
           name: 'test',
           type: 'sqlite',
           database: databaseFile,
@@ -79,7 +82,7 @@ describe('database initial migration tests', () => {
           logging: false,
           entities: Entities,
           ...connectionOverrides,
-        } as ConnectionOptions)
+        } as DataSourceOptions)
 
         agent = createAgent<TestingAgentPlugins>({
           context: {

diff --git a/__tests__/localAgent.test.ts b/__tests__/localAgent.test.ts
@@ -1,3 +1,5 @@
+// noinspection ES6PreferShortImport
+
 /**
  * This runs a suite of ./shared tests using an agent configured for local operations,
  * using a SQLite db for storage of credentials, presentations, messages as well as keys and DIDs.
@@ -45,17 +47,17 @@ import { DIDDiscovery, IDIDDiscovery } from '../packages/did-discovery/src'
 
 import {
   DataStore,
+  DataStoreDiscoveryProvider,
   DataStoreORM,
   DIDStore,
   Entities,
   KeyStore,
   migrations,
   PrivateKeyStore,
-  DataStoreDiscoveryProvider,
 } from '../packages/data-store/src'
-import { FakeDidProvider, FakeDidResolver } from '../packages/test-utils/src'
+import { BrokenDiscoveryProvider, FakeDidProvider, FakeDidResolver } from '../packages/test-utils/src'
 
-import { Connection, createConnection } from 'typeorm'
+import { DataSource } from 'typeorm'
 import { createGanacheProvider } from './utils/ganache-provider'
 import { createEthersProvider } from './utils/ethers-provider'
 import { Resolver } from 'did-resolver'
@@ -102,13 +104,13 @@ let agent: TAgent<
     ISelectiveDisclosure &
     IDIDDiscovery
 >
-let dbConnection: Promise<Connection>
+let dbConnection: Promise<DataSource>
 let databaseFile: string
 
 const setup = async (options?: IAgentOptions): Promise<boolean> => {
   databaseFile =
     options?.context?.databaseFile || `./tmp/local-database-${Math.random().toPrecision(5)}.sqlite`
-  dbConnection = createConnection({
+  dbConnection = new DataSource({
     name: options?.context?.['dbName'] || 'test',
     type: 'sqlite',
     database: databaseFile,
@@ -119,7 +121,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
     entities: Entities,
     // allow shared tests to override connection options
     ...options?.context?.dbConnectionOptions,
-  })
+  }).initialize()
 
   const { provider, registry } = await createGanacheProvider()
   const ethersProvider = createEthersProvider()
@@ -228,7 +230,11 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
       }),
       new SelectiveDisclosure(),
       new DIDDiscovery({
-        providers: [new AliasDiscoveryProvider(), new DataStoreDiscoveryProvider()],
+        providers: [
+          new AliasDiscoveryProvider(),
+          new DataStoreDiscoveryProvider(),
+          new BrokenDiscoveryProvider(),
+        ],
       }),
       ...(options?.plugins || []),
     ],

diff --git a/__tests__/localJsonStoreAgent.test.ts b/__tests__/localJsonStoreAgent.test.ts
@@ -34,19 +34,10 @@ import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
 import { WebDIDProvider } from '../packages/did-provider-web/src'
 import { getDidKeyResolver, KeyDIDProvider } from '../packages/did-provider-key/src'
 import { DIDComm, DIDCommMessageHandler, IDIDComm } from '../packages/did-comm/src'
-import {
-  ISelectiveDisclosure,
-  SdrMessageHandler,
-  SelectiveDisclosure,
-} from '../packages/selective-disclosure/src'
+import { ISelectiveDisclosure, SdrMessageHandler, SelectiveDisclosure, } from '../packages/selective-disclosure/src'
 import { KeyManagementSystem, SecretBox } from '../packages/kms-local/src'
 import { Web3KeyManagementSystem } from '../packages/kms-web3/src'
-import {
-  DataStoreJson,
-  DIDStoreJson,
-  KeyStoreJson,
-  PrivateKeyStoreJson,
-} from '../packages/data-store-json/src'
+import { DataStoreJson, DIDStoreJson, KeyStoreJson, PrivateKeyStoreJson, } from '../packages/data-store-json/src'
 import { FakeDidProvider, FakeDidResolver } from '../packages/test-utils/src'
 
 import { Resolver } from 'did-resolver'

diff --git a/__tests__/localMemoryStoreAgent.test.ts b/__tests__/localMemoryStoreAgent.test.ts
@@ -1,3 +1,5 @@
+// noinspection ES6PreferShortImport
+
 /**
  * This runs a suite of ./shared tests using an agent configured for local operations,
  * using a SQLite db for storage of credentials and an in-memory store for keys and DIDs.
@@ -17,7 +19,7 @@ import {
 import { MessageHandler } from '../packages/message-handler/src'
 import { KeyManager, MemoryKeyStore, MemoryPrivateKeyStore } from '../packages/key-manager/src'
 import { DIDManager, MemoryDIDStore } from '../packages/did-manager/src'
-import { Connection, createConnection } from 'typeorm'
+import { DataSource } from 'typeorm'
 import { DIDResolverPlugin } from '../packages/did-resolver/src'
 import { JwtMessageHandler } from '../packages/did-jwt/src'
 import { CredentialIssuer, ICredentialIssuer, W3cMessageHandler } from '../packages/credential-w3c/src'
@@ -71,21 +73,22 @@ const infuraProjectId = '3586660d179141e3801c3895de1c2eba'
 
 let agent: TAgent<
   IDIDManager &
-  IKeyManager &
-  IDataStore &
-  IDataStoreORM &
-  IResolver &
-  IMessageHandler &
-  IDIDComm &
-  ICredentialIssuer &
-  ICredentialIssuerLD &
-  ICredentialIssuerEIP712 &
-  ISelectiveDisclosure
+    IKeyManager &
+    IDataStore &
+    IDataStoreORM &
+    IResolver &
+    IMessageHandler &
+    IDIDComm &
+    ICredentialIssuer &
+    ICredentialIssuerLD &
+    ICredentialIssuerEIP712 &
+    ISelectiveDisclosure
 >
-let dbConnection: Promise<Connection>
+let dbConnection: DataSource
 
 const setup = async (options?: IAgentOptions): Promise<boolean> => {
-  dbConnection = createConnection({
+  // intentionally not initializing here to test compatibility
+  dbConnection = new DataSource({
     name: 'test',
     type: 'sqlite',
     database: databaseFile,
@@ -98,16 +101,16 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
 
   agent = createAgent<
     IDIDManager &
-    IKeyManager &
-    IDataStore &
-    IDataStoreORM &
-    IResolver &
-    IMessageHandler &
-    IDIDComm &
-    ICredentialIssuer &
-    ICredentialIssuerLD &
-    ICredentialIssuerEIP712 &
-    ISelectiveDisclosure
+      IKeyManager &
+      IDataStore &
+      IDataStoreORM &
+      IResolver &
+      IMessageHandler &
+      IDIDComm &
+      ICredentialIssuer &
+      ICredentialIssuerLD &
+      ICredentialIssuerEIP712 &
+      ISelectiveDisclosure
   >({
     ...options,
     context: {
@@ -218,6 +221,6 @@ describe('Local in-memory integration tests', () => {
   didManager(testContext)
   messageHandler(testContext)
   didCommPacking(testContext)
-  utils(testContext)  
+  utils(testContext)
   credentialStatus(testContext)
 })
diff --git a/__tests__/restAgent.test.ts b/__tests__/restAgent.test.ts
@@ -1,6 +1,9 @@
+// noinspection ES6PreferShortImport
+
 /**
  * This runs a suite of ./shared tests using an agent configured for remote operations.
- * There is a local agent that only uses @veramo/remove-client and a remote agent that provides the actual functionality.
+ * There is a local agent that only uses @veramo/remove-client and a remote agent that provides the actual
+ * functionality.
  *
  * This suite also runs a messaging server to run through some examples of DIDComm using did:fake identifiers.
  * See didWithFakeDidFlow() for more details.
@@ -46,20 +49,20 @@ import { KeyManagementSystem, SecretBox } from '../packages/kms-local/src'
 import { Web3KeyManagementSystem } from '../packages/kms-web3/src'
 import {
   DataStore,
+  DataStoreDiscoveryProvider,
   DataStoreORM,
   DIDStore,
   Entities,
   KeyStore,
   migrations,
   PrivateKeyStore,
-  DataStoreDiscoveryProvider,
 } from '../packages/data-store/src'
-import { Connection, createConnection } from 'typeorm'
 import { AgentRestClient } from '../packages/remote-client/src'
 import { AgentRouter, MessagingRouter, RequestWithAgentRouter } from '../packages/remote-server/src'
 import { DIDDiscovery, IDIDDiscovery } from '../packages/did-discovery/src'
-import { FakeDidProvider, FakeDidResolver } from '../packages/test-utils/src'
+import { BrokenDiscoveryProvider, FakeDidProvider, FakeDidResolver } from '../packages/test-utils/src'
 
+import { DataSource } from 'typeorm'
 import { Resolver } from 'did-resolver'
 import { getResolver as ethrDidResolver } from 'ethr-did-resolver'
 import { getResolver as webDidResolver } from 'web-did-resolver'
@@ -93,7 +96,7 @@ const secretKey = '29739248cad1bd1a0fc4d9b75cd4d2990de535baf5caadfdf8d8f86664aa8
 const port = 3002
 const basePath = '/agent'
 
-let dbConnection: Promise<Connection>
+let dbConnection: Promise<DataSource>
 let serverAgent: IAgent
 let restServer: Server
 
@@ -123,7 +126,7 @@ const getAgent = (options?: IAgentOptions) =>
   })
 
 const setup = async (options?: IAgentOptions): Promise<boolean> => {
-  dbConnection = createConnection({
+  dbConnection = new DataSource({
     name: options?.context?.['dbName'] || 'sqlite-test',
     type: 'sqlite',
     database: databaseFile,
@@ -132,7 +135,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
     migrationsRun: true,
     logging: false,
     entities: Entities,
-  })
+  }).initialize()
 
   serverAgent = new Agent({
     ...options,
@@ -141,7 +144,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
         store: new KeyStore(dbConnection),
         kms: {
           local: new KeyManagementSystem(new PrivateKeyStore(dbConnection, new SecretBox(secretKey))),
-          web3: new Web3KeyManagementSystem({})
+          web3: new Web3KeyManagementSystem({}),
         },
       }),
       new DIDManager({
@@ -205,7 +208,11 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
       }),
       new SelectiveDisclosure(),
       new DIDDiscovery({
-        providers: [new AliasDiscoveryProvider(), new DataStoreDiscoveryProvider()],
+        providers: [
+          new AliasDiscoveryProvider(),
+          new DataStoreDiscoveryProvider(),
+          new BrokenDiscoveryProvider(),
+        ],
       }),
       ...(options?.plugins || []),
     ],
@@ -267,6 +274,6 @@ describe('REST integration tests', () => {
   didCommPacking(testContext)
   didWithFakeDidFlow(testContext)
   didDiscovery(testContext)
-  utils(testContext)  
+  utils(testContext)
   credentialStatus(testContext)
 })