Skip to content

Commit

Permalink
fix: ts-ignoring logger type incompatibilities
Browse files Browse the repository at this point in the history
  • Loading branch information
emmacasolin committed Jul 27, 2022
1 parent f9b97df commit 96777ad
Show file tree
Hide file tree
Showing 65 changed files with 72 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/PolykeyAgent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ class PolykeyAgent {
},
},
fs,
// @ts-ignore - version of js-logger is incompatible (remove when DB updates to 5.*)
logger: logger.getChild(DB.name),
fresh,
}));
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ async function bootstrapState({
const db = await DB.createDB({
dbPath,
fs,
// @ts-ignore - version of js-logger is incompatible (remove when DB updates to 5.*)
logger: logger.getChild(DB.name),
crypto: {
key: keyManager.dbKey,
Expand Down
1 change: 1 addition & 0 deletions src/vaults/VaultManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ class VaultManager {
efs = await EncryptedFS.createEncryptedFS({
dbPath: this.efsPath,
dbKey: vaultKey,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger: this.logger.getChild('EncryptedFileSystem'),
});
} catch (e) {
Expand Down
1 change: 1 addition & 0 deletions tests/acl/ACL.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ describe(ACL.name, () => {
const dbPath = `${dataDir}/db`;
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: dbKey,
Expand Down
1 change: 1 addition & 0 deletions tests/agent/GRPCClientAgent.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ describe(GRPCClientAgent.name, () => {
db = await DB.createDB({
dbPath: dbPath,
fs: fs,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger: logger,
crypto: {
key: keyManager.dbKey,
Expand Down
1 change: 1 addition & 0 deletions tests/agent/service/notificationsSend.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ describe('notificationsSend', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/agentLockAll.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('agentLockall', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: keyManager.dbKey,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ describe('gestaltsActionsByIdentity', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ describe('gestaltsActionsByNode', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/gestaltsDiscoveryByIdentity.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ describe('gestaltsDiscoveryByIdentity', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: keyManager.dbKey,
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/gestaltsDiscoveryByNode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ describe('gestaltsDiscoveryByNode', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: keyManager.dbKey,
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/gestaltsGestaltGetByIdentity.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ describe('gestaltsGestaltGetByIdentity', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/gestaltsGestaltGetByNode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ describe('gestaltsGestaltGetByNode', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/gestaltsGestaltList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ describe('gestaltsGestaltList', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ describe('gestaltsGestaltTrustByIdentity', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: keyManager.dbKey,
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/gestaltsGestaltTrustByNode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ describe('gestaltsGestaltTrustByNode', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: keyManager.dbKey,
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/identitiesAuthenticate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ describe('identitiesAuthenticate', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
identitiesManager = await IdentitiesManager.createIdentitiesManager({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/identitiesAuthenticatedGet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe('identitiesAuthenticatedGet', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
identitiesManager = await IdentitiesManager.createIdentitiesManager({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/identitiesClaim.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ describe('identitiesClaim', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
identitiesManager = await IdentitiesManager.createIdentitiesManager({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/identitiesInfoConnectedGet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ describe('identitiesInfoConnectedGet', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
identitiesManager = await IdentitiesManager.createIdentitiesManager({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/identitiesInfoGet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ describe('identitiesInfoGet', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
identitiesManager = await IdentitiesManager.createIdentitiesManager({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/identitiesProvidersList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ describe('identitiesProvidersList', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
identitiesManager = await IdentitiesManager.createIdentitiesManager({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/identitiesTokenPutDeleteGet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ describe('identitiesTokenPutDeleteGet', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
identitiesManager = await IdentitiesManager.createIdentitiesManager({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/nodesClaim.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ describe('nodesClaim', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/nodesFind.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ describe('nodesFind', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
proxy = new Proxy({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/nodesPing.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ describe('nodesPing', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
proxy = new Proxy({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/notificationsClear.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ describe('notificationsClear', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/notificationsRead.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ describe('notificationsRead', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/notificationsSend.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ describe('notificationsSend', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsClone.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ describe('vaultsClone', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsCreateDeleteList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ describe('vaultsCreateDeleteList', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsLog.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ describe('vaultsLog', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsPermissionSetUnsetGet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ describe('vaultsPermissionSetUnsetGet', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
acl = await ACL.createACL({
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsPull.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ describe('vaultsPull', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsRename.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ describe('vaultsRename', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsSecretsEdit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ describe('vaultsSecretsEdit', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsSecretsMkdir.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ describe('vaultsSecretsMkdir', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsSecretsNewDeleteGet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ describe('vaultsSecretsNewDeleteGet', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsSecretsNewDirList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ describe('vaultsSecretsNewDirList', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsSecretsRename.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ describe('vaultsSecretsRename', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsSecretsStat.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ describe('vaultsSecretsStat', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/client/service/vaultsVersion.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ describe('vaultsVersion', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
const vaultsPath = path.join(dataDir, 'vaults');
Expand Down
1 change: 1 addition & 0 deletions tests/discovery/Discovery.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ describe('Discovery', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger: logger.getChild('db'),
crypto: {
key: keyManager.dbKey,
Expand Down
1 change: 1 addition & 0 deletions tests/gestalts/GestaltGraph.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ describe('GestaltGraph', () => {
const dbPath = `${dataDir}/db`;
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: await keysUtils.generateKey(),
Expand Down
1 change: 1 addition & 0 deletions tests/git/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ describe('Git utils', () => {
efs = await EncryptedFS.createEncryptedFS({
dbKey,
dbPath: dataDir,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
});
await efs.start();
Expand Down
1 change: 1 addition & 0 deletions tests/grpc/GRPCClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ describe('GRPCClient', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: await keysUtils.generateKey(),
Expand Down
1 change: 1 addition & 0 deletions tests/grpc/GRPCServer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ describe('GRPCServer', () => {
const dbPath = path.join(dataDir, 'db');
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: keyManager.dbKey,
Expand Down
1 change: 1 addition & 0 deletions tests/identities/IdentitiesManager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ describe('IdentitiesManager', () => {
const dbPath = `${dataDir}/db`;
db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when EFS logger updates to 3.*)
logger,
crypto: {
key: await keysUtils.generateKey(),
Expand Down
2 changes: 2 additions & 0 deletions tests/keys/KeyManager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ describe('KeyManager', () => {
const dbPath = `${dataDir}/db`;
const db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when DB updates to 5.*)
logger,
crypto: {
key: keyManager.dbKey,
Expand Down Expand Up @@ -352,6 +353,7 @@ describe('KeyManager', () => {
const dbPath = `${dataDir}/db`;
const db = await DB.createDB({
dbPath,
// @ts-ignore - version of js-logger is incompatible (remove when DB updates to 5.*)
logger,
crypto: {
key: keyManager.dbKey,
Expand Down
Loading

0 comments on commit 96777ad

Please sign in to comment.