Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #3555 from trufflesuite/db-loggers
Browse files Browse the repository at this point in the history 
Fix logger names for @truffle/db resources
  • Loading branch information
@gnidan
gnidan authored Nov 24, 2020
2 parents 6f4b01b + 3775206 commit bee8496
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 71 deletions.
20 changes: 9 additions & 11 deletions packages/db/src/resources/bytecodes.ts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { logger } from "@truffle/db/logger";
const debug = logger("db:definitions:bytecodes");
import {logger} from "@truffle/db/logger";
const debug = logger("db:resources:bytecodes");

import gql from "graphql-tag";
import CodeUtils from "@truffle/code-utils";

import { Definition } from "./types";
import {Definition} from "./types";

export const bytecodes: Definition<"bytecodes"> = {
createIndexes: [],
Expand Down Expand Up @@ -47,16 +47,14 @@ export const bytecodes: Definition<"bytecodes"> = {
resolvers: {
Bytecode: {
instructions: {
async resolve({ bytes }, { count = null }) {
async resolve({bytes}, {count = null}) {
const parsed = CodeUtils.parseCode(`0x${bytes}`, count);

return parsed.map(
({ name: opcode, pc: programCounter, pushData }) => ({
opcode,
programCounter,
pushData
})
);
return parsed.map(({name: opcode, pc: programCounter, pushData}) => ({
opcode,
programCounter,
pushData
}));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/db/src/resources/compilations.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {logger} from "@truffle/db/logger";
const debug = logger("db:definitions:compilations");
const debug = logger("db:resources:compilations");

import gql from "graphql-tag";

Expand Down
18 changes: 9 additions & 9 deletions packages/db/src/resources/contractInstances.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { logger } from "@truffle/db/logger";
const debug = logger("db:definitions:contractInstances");
import {logger} from "@truffle/db/logger";
const debug = logger("db:resources:contractInstances");

import gql from "graphql-tag";

import { Definition } from "./types";
import {Definition} from "./types";

export const contractInstances: Definition<"contractInstances"> = {
createIndexes: [],
Expand Down Expand Up @@ -79,7 +79,7 @@ export const contractInstances: Definition<"contractInstances"> = {
resolvers: {
ContractInstance: {
network: {
resolve: async ({ network: { id } }, _, { workspace }) => {
resolve: async ({network: {id}}, _, {workspace}) => {
debug("Resolving ContractInstance.network...");

const result = await workspace.get("networks", id);
Expand All @@ -89,7 +89,7 @@ export const contractInstances: Definition<"contractInstances"> = {
}
},
contract: {
resolve: async ({ contract: { id } }, _, { workspace }) => {
resolve: async ({contract: {id}}, _, {workspace}) => {
debug("Resolving ContractInstance.contract...");
const result = await workspace.get("contracts", id);

Expand All @@ -98,15 +98,15 @@ export const contractInstances: Definition<"contractInstances"> = {
}
},
callBytecode: {
resolve: async ({ callBytecode }, _, { workspace }) => {
resolve: async ({callBytecode}, _, {workspace}) => {
debug("Resolving ContractInstance.callBytecode...");

const bytecode = await workspace.get(
"bytecodes",
callBytecode.bytecode.id
);
const linkValues = callBytecode.linkValues.map(
({ value, linkReference }) => {
({value, linkReference}) => {
return {
value: value,
linkReference: bytecode.linkReferences[linkReference.index]
Expand All @@ -122,7 +122,7 @@ export const contractInstances: Definition<"contractInstances"> = {
}
},
creation: {
resolve: async (input, _, { workspace }) => {
resolve: async (input, _, {workspace}) => {
debug("Resolving ContractInstance.creation...");

let bytecode = await workspace.get(
Expand All @@ -131,7 +131,7 @@ export const contractInstances: Definition<"contractInstances"> = {
);
let transactionHash = input.creation.transactionHash;
let linkValues = input.creation.constructor.createBytecode.linkValues.map(
({ value, linkReference }) => {
({value, linkReference}) => {
return {
value: value,
linkReference: bytecode.linkReferences[linkReference.index]
Expand Down
22 changes: 11 additions & 11 deletions packages/db/src/resources/contracts.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { logger } from "@truffle/db/logger";
const debug = logger("db:definitions:contracts");
import {logger} from "@truffle/db/logger";
const debug = logger("db:resources:contracts");

import gql from "graphql-tag";
import { pascalCase } from "change-case";
import { normalize } from "@truffle/abi-utils";

import { Definition } from "./types";
import {Definition} from "./types";

export const contracts: Definition<"contracts"> = {
createIndexes: [
Expand Down Expand Up @@ -110,7 +110,7 @@ export const contracts: Definition<"contracts"> = {
resolvers: {
Contract: {
compilation: {
resolve: async ({ compilation: { id } }, _, { workspace }) => {
resolve: async ({compilation: {id}}, _, {workspace}) => {
debug("Resolving Contract.compilation...");

const result = workspace.get("compilations", id);
Expand All @@ -122,27 +122,27 @@ export const contracts: Definition<"contracts"> = {
processedSource: {
fragment: `... on Contract { compilation { id } }`,
resolve: async (
{ processedSource, compilation: { id } },
{processedSource, compilation: {id}},
_,
{ workspace }
{workspace}
) => {
debug("Resolving Contract.processedSource...");

const { processedSources } = await workspace.get("compilations", id);
const {processedSources} = await workspace.get("compilations", id);

debug("Resolved Contract.processedSource.");
return processedSources[processedSource.index];
}
},
createBytecode: {
resolve: async ({ createBytecode }, _, { workspace }) => {
resolve: async ({createBytecode}, _, {workspace}) => {
debug("Resolving Contract.createBytecode...");

if (!createBytecode) {
return;
}

const { id } = createBytecode;
const {id} = createBytecode;

const result = await workspace.get("bytecodes", id);

Expand All @@ -151,14 +151,14 @@ export const contracts: Definition<"contracts"> = {
}
},
callBytecode: {
resolve: async ({ callBytecode }, _, { workspace }) => {
resolve: async ({callBytecode}, _, {workspace}) => {
debug("Resolving Contract.callBytecode...");

if (!callBytecode) {
return;
}

const { id } = callBytecode;
const {id} = callBytecode;

const result = await workspace.get("bytecodes", id);

Expand Down
26 changes: 13 additions & 13 deletions packages/db/src/resources/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { logger } from "@truffle/db/logger";
const debug = logger("db:definitions");
import {logger} from "@truffle/db/logger";
const debug = logger("db:resources");

import { Definitions } from "./types";
import {Definitions} from "./types";
export * from "./types";

import { sources } from "./sources";
import { bytecodes } from "./bytecodes";
import { compilations } from "./compilations";
import { contracts } from "./contracts";
import { contractInstances } from "./contractInstances";
import { networks } from "./networks";
import { nameRecords } from "./nameRecords";
import { projects } from "./projects";
import { projectNames } from "./projectNames";
import { networkGenealogies } from "./networkGenealogies";
import {sources} from "./sources";
import {bytecodes} from "./bytecodes";
import {compilations} from "./compilations";
import {contracts} from "./contracts";
import {contractInstances} from "./contractInstances";
import {networks} from "./networks";
import {nameRecords} from "./nameRecords";
import {projects} from "./projects";
import {projectNames} from "./projectNames";
import {networkGenealogies} from "./networkGenealogies";

export const definitions: Definitions = {
sources,
Expand Down
10 changes: 5 additions & 5 deletions packages/db/src/resources/projectNames.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { logger } from "@truffle/db/logger";
const debug = logger("db:definitions:projectNames");
import {logger} from "@truffle/db/logger";
const debug = logger("db:resources:projectNames");

import gql from "graphql-tag";

import { Definition } from "./types";
import {Definition} from "./types";

export const projectNames: Definition<"projectNames"> = {
createIndexes: [
Expand Down Expand Up @@ -38,7 +38,7 @@ export const projectNames: Definition<"projectNames"> = {
resolvers: {
ProjectName: {
project: {
resolve: async ({ project: { id } }, _, { workspace }) => {
resolve: async ({project: {id}}, _, {workspace}) => {
debug("Resolving ProjectName.project...");

const result = await workspace.get("projects", id);
Expand All @@ -48,7 +48,7 @@ export const projectNames: Definition<"projectNames"> = {
}
},
nameRecord: {
resolve: async ({ nameRecord: { id } }, _, { workspace }) => {
resolve: async ({nameRecord: {id}}, _, {workspace}) => {
debug("Resolving ProjectName.nameRecord...");

const result = await workspace.get("nameRecords", id);
Expand Down
34 changes: 17 additions & 17 deletions packages/db/src/resources/projects.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { logger } from "@truffle/db/logger";
const debug = logger("db:definitions:projects");
import {logger} from "@truffle/db/logger";
const debug = logger("db:resources:projects");

import gql from "graphql-tag";

import { Definition } from "./types";
import {Definition} from "./types";

export const projects: Definition<"projects"> = {
createIndexes: [],
Expand All @@ -26,18 +26,18 @@ export const projects: Definition<"projects"> = {
resolvers: {
Project: {
resolve: {
resolve: async ({ id }, { name, type }, { workspace }) => {
resolve: async ({id}, {name, type}, {workspace}) => {
debug("Resolving Project.resolve...");

const results = await workspace.find("projectNames", {
selector: { "project.id": id, name, type }
selector: {"project.id": id, name, type}
});

const nameRecordIds = results.map(({ nameRecord: { id } }) => id);
const nameRecordIds = results.map(({nameRecord: {id}}) => id);

const result = await workspace.find("nameRecords", {
selector: {
id: { $in: nameRecordIds }
id: {$in: nameRecordIds}
}
});

Expand All @@ -46,23 +46,23 @@ export const projects: Definition<"projects"> = {
}
},
network: {
resolve: async ({ id }, { name }, { workspace }) => {
resolve: async ({id}, {name}, {workspace}) => {
debug("Resolving Project.network...");

const results = await workspace.find("projectNames", {
selector: { "project.id": id, name, "type": "Network" }
selector: {"project.id": id, name, "type": "Network"}
});
const nameRecordIds = results.map(({ nameRecord: { id } }) => id);
const nameRecordIds = results.map(({nameRecord: {id}}) => id);
const nameRecords = await workspace.find("nameRecords", {
selector: {
id: { $in: nameRecordIds }
id: {$in: nameRecordIds}
}
});

if (nameRecords.length === 0) {
return;
}
const { resource } = nameRecords[0];
const {resource} = nameRecords[0];

const result = await workspace.get("networks", resource.id);

Expand All @@ -71,23 +71,23 @@ export const projects: Definition<"projects"> = {
}
},
contract: {
resolve: async ({ id }, { name }, { workspace }) => {
resolve: async ({id}, {name}, {workspace}) => {
debug("Resolving Project.contract...");

const results = await workspace.find("projectNames", {
selector: { "project.id": id, name, "type": "Contract" }
selector: {"project.id": id, name, "type": "Contract"}
});
const nameRecordIds = results.map(({ nameRecord: { id } }) => id);
const nameRecordIds = results.map(({nameRecord: {id}}) => id);
const nameRecords = await workspace.find("nameRecords", {
selector: {
id: { $in: nameRecordIds }
id: {$in: nameRecordIds}
}
});

if (nameRecords.length === 0) {
return;
}
const { resource } = nameRecords[0];
const {resource} = nameRecords[0];

const result = await workspace.get("contracts", resource.id);

Expand Down
6 changes: 3 additions & 3 deletions packages/db/src/resources/sources.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { logger } from "@truffle/db/logger";
const debug = logger("db:definitions:sources");
import {logger} from "@truffle/db/logger";
const debug = logger("db:resources:sources");

import gql from "graphql-tag";

import { Definition } from "./types";
import {Definition} from "./types";

export const sources: Definition<"sources"> = {
createIndexes: [],
Expand Down
2 changes: 1 addition & 1 deletion packages/db/src/resources/types.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {logger} from "@truffle/db/logger";
const debug = logger("db:definitions:types");
const debug = logger("db:resources:types");

import * as Meta from "@truffle/db/meta";
import * as Pouch from "@truffle/db/pouch";
Expand Down

0 comments on commit bee8496

Please sign in to comment.