new hair dont care!

trufflesuite · Mar 4, 2022 · f116e2f · f116e2f
1 parent e7a0b9c
commit f116e2f
Show file tree

Hide file tree

Showing 5 changed files with 265 additions and 440 deletions.
diff --git a/packages/db-kit/package.json b/packages/db-kit/package.json
@@ -37,9 +37,9 @@
     "test": "jest --verbose --detectOpenHandles --forceExit --passWithNoTests"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^27.4.1",
     "@types/node": "12.12.21",
-    "@types/react": "^17.0.2",
+    "@types/react": "^16.8.0",
     "@types/web3": "^1.0.20",
     "eslint-plugin-react-hooks": "^4.3.0",
     "jest": "^26.5.2",
@@ -72,7 +72,7 @@
     "ink-syntax-highlight": "^1.0.1",
     "ink-text-input": "^4.0.1",
     "meow": "^9.0.0",
-    "react": "^17.0.1",
+    "react": "^16.8.0",
     "source-map-support": "^0.5.19"
   }
 }
diff --git a/packages/db/package.json b/packages/db/package.json
@@ -40,8 +40,9 @@
     "@graphql-tools/schema": "^8.3.1",
     "@truffle/abi-utils": "^0.2.9",
     "@truffle/code-utils": "^1.2.32",
-    "@truffle/config": "^1.3.21",
-    "apollo-server": "^2.18.2",
+    "@truffle/config": "^1.3.20",
+    "abstract-leveldown": "^7.2.0",
+    "apollo-server": "^3.6.3",
     "debug": "^4.3.1",
     "fs-extra": "^9.1.0",
     "graphql": "^15.3.0",
@@ -66,10 +67,10 @@
     "@types/debug": "^4.1.5",
     "@types/express": "^4.16.0",
     "@types/graphql": "^14.5.0",
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^27.4.1",
     "@types/node": "12.12.21",
     "@types/pluralize": "^0.0.29",
-    "@types/pouchdb": "^6.3.2",
+    "@types/pouchdb": "^6.4.0",
     "@types/pouchdb-adapter-leveldb": "^6.1.3",
     "@types/web3": "^1.0.20",
     "change-case": "3.0.2",

diff --git a/packages/db/src/meta/interface.ts b/packages/db/src/meta/interface.ts
@@ -33,7 +33,7 @@ export const forAttachAndSchema = <C extends Collections>(options: {
   const connect = (connectOptions?: ConnectOptions<C>): Db<C> => {
     const attachOptions = {
       adapter: (connectOptions || {}).adapter
-    }
+    };
     const workspace = attach(attachOptions);
 
     return {
@@ -68,11 +68,10 @@ export const forAttachAndSchema = <C extends Collections>(options: {
   const serve = (serveOptions?: ConnectOptions<C>) => {
     const attachOptions = {
       adapter: (serveOptions || {}).adapter
-    }
+    };
     const workspace = attach(attachOptions);
 
     return new ApolloServer({
-      tracing: true,
       schema,
       context: { workspace }
     });

diff --git a/packages/db/src/project/test/integration.spec.ts b/packages/db/src/project/test/integration.spec.ts
@@ -19,7 +19,7 @@ import type { Query, Mutation } from "@truffle/db/process";
 
 let server;
 const port = 8545;
-
+// @ts-ignore
 beforeAll(async done => {
   server = Ganache.server({
     // note instamine must be set to eager (default) with vmErrorsOnRPCResponse enabled
@@ -463,24 +463,35 @@ describe("Compilation", () => {
     migrationConfig.reset = true;
     await Migrate.run(migrationConfig);
 
-    sourceIds = artifacts.map(artifact => ({
-      id: generateId("sources", {
-        contents: artifact["source"],
-        sourcePath: artifact["sourcePath"]
-      })
-    } as IdObject<"sources">));
+    sourceIds = artifacts.map(
+      artifact =>
+        ({
+          id: generateId("sources", {
+            contents: artifact["source"],
+            sourcePath: artifact["sourcePath"]
+          })
+        } as IdObject<"sources">)
+    );
 
-    bytecodeIds = artifacts.map(artifact => ({
-      id: generateId(
-        "bytecodes", Shims.LegacyToNew.forBytecode(artifact["bytecode"])
-      )
-    } as IdObject<"bytecodes">));
+    bytecodeIds = artifacts.map(
+      artifact =>
+        ({
+          id: generateId(
+            "bytecodes",
+            Shims.LegacyToNew.forBytecode(artifact["bytecode"])
+          )
+        } as IdObject<"bytecodes">)
+    );
 
-    callBytecodeIds = artifacts.map(artifact => ({
-      id: generateId(
-        "bytecodes", Shims.LegacyToNew.forBytecode(artifact["deployedBytecode"])
-      )
-    } as IdObject<"bytecodes">));
+    callBytecodeIds = artifacts.map(
+      artifact =>
+        ({
+          id: generateId(
+            "bytecodes",
+            Shims.LegacyToNew.forBytecode(artifact["deployedBytecode"])
+          )
+        } as IdObject<"bytecodes">)
+    );
 
     expectedSolcCompilationId = generateId("compilations", {
       compiler: artifacts[0].compiler,
@@ -509,7 +520,7 @@ describe("Compilation", () => {
         );
         // @ts-ignore won't be undefined
         let bytecodeId: string = generateId("bytecodes", shimBytecodeObject);
-        let callBytecodeId = generateId("bytecodes", shimCallBytecodeObject);
+        //let callBytecodeId = generateId("bytecodes", shimCallBytecodeObject);
 
         // @ts-ignore won't be updefined
         let contractId: string = generateId("contracts", {
@@ -574,7 +585,7 @@ describe("Compilation", () => {
                 createBytecode: {
                   bytecode: { id: bytecodeId },
                   linkValues: shimBytecodeObject.linkReferences
-                    .filter((linkReference) => !!linkReference.name)
+                    .filter(linkReference => !!linkReference.name)
                     .map(({ name }, index) => ({
                       // @ts-ignore name won't be null because filter
                       value: links[name],
@@ -587,9 +598,9 @@ describe("Compilation", () => {
               }
             }
           });
-          contractInstanceIds.push({ id: contractInstanceId } as IdObject<
-            "contractInstances"
-          >);
+          contractInstanceIds.push({
+            id: contractInstanceId
+          } as IdObject<"contractInstances">);
           contractInstances.push({
             address: networksArray[networksArray.length - 1][1]["address"],
             network: {
@@ -740,9 +751,8 @@ describe("Compilation", () => {
       })
     );
 
-    const solcCompilation = compilationsQuery[0].data.compilation as Resource<
-      "compilations"
-    >;
+    const solcCompilation = compilationsQuery[0].data
+      .compilation as Resource<"compilations">;
 
     expect(solcCompilation.compiler.version).toEqual(
       artifacts[0].compiler.version
@@ -854,7 +864,7 @@ describe("Compilation", () => {
 
   it("loads contracts", async () => {
     for (let index in artifacts) {
-      let expectedId = contractIds[index];
+      //let expectedId = contractIds[index];
 
       let {
         data: {
@@ -956,7 +966,6 @@ describe("Compilation", () => {
   });
 
   it("loads contract instances", async () => {
-
     for (const contractInstanceId of contractInstanceIds) {
       let {
         data: {