Merge pull request #120 from proto-kit/fix/test-cleanup-mar-23

Fixed tests, cleanup

Author: rpanic

.eslintrc

@@ -139,7 +139,8 @@
         "@typescript-eslint/init-declarations": "off", //conflicts with beforeEach initialization
         "unicorn/consistent-function-scoping": "off", //Describe-level functions
         "@typescript-eslint/no-magic-numbers": "off",
-        "jest/no-disabled-tests": "off" //For now
+        "jest/no-disabled-tests": "off", //For now
+        "import/no-extraneous-dependencies": "off"
       }
     },
     {

.github/workflows/pull-request-develop.yml

@@ -89,8 +89,5 @@ jobs:
       - name: "Build"
         run: npm run build
 
-      - name: "Reinstall monorepo packages"
-        run: npm ci --workspaces --include-workspace-root
-
       - name: "Test"
         run: npm run test:ci

.npmrc

@@ -0,0 +1 @@
+script-shell=bash

package-lock.json

@@ -8,7 +8,7 @@
     "build": "npx lerna run build",
     "lint": "npx lerna run lint",
     "lint:staged": "eslint",
-    "test": "npx lerna run test -- --passWithNoTests",
+    "test": "npx lerna run test --scope=\"*/sdk\" -- --passWithNoTests",
     "test:ci": "npx lerna run test -- --passWithNoTests --forceExit",
     "test:watch": "npx lerna run test:watch",
     "commit": "cz",

package.json

@@ -9,8 +9,8 @@
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint ./src ./test",
     "test:file": "node --experimental-vm-modules --experimental-wasm-modules --experimental-wasm-threads ../../node_modules/jest/bin/jest.js",
-    "test": "npm run test:file -- ./src/** ./test/**",
-    "test:watch": "npm run test:file -- ./src/** ./test/** --watch"
+    "test": "npm run test:file -- ./test/**",
+    "test:watch": "npm run test:file -- ./test/** --watch"
   },
   "main": "dist/index.js",
   "publishConfig": {

packages/api/package.json

@@ -129,9 +129,9 @@ export class MempoolResolver extends GraphqlModule {
   }
 
   @Mutation(() => String)
-  public submitTx(@Arg("tx") tx: TransactionObject): string {
+  public async submitTx(@Arg("tx") tx: TransactionObject): Promise<string> {
     const decoded = PendingTransaction.fromJSON(tx);
-    this.mempool.add(decoded);
+    await this.mempool.add(decoded);
 
     return decoded.hash().toString();
   }

packages/api/src/graphql/modules/MempoolResolver.ts

@@ -48,6 +48,7 @@ import {
   log,
   ModuleContainer,
   ModulesRecord,
+  NonMethods,
   range,
 } from "@proto-kit/common";
 import { ObjMap } from "graphql/jsutils/ObjMap";
@@ -61,11 +62,6 @@ interface ProvableExtension<T, TJson = any> {
   fromJSON: (x: TJson) => T;
 }
 
-type NonMethodKeys<Type> = {
-  [Key in keyof Type]: Type[Key] extends Function ? never : Key;
-}[keyof Type];
-type NonMethods<Type> = Pick<Type, NonMethodKeys<Type>>;
-
 interface AnyJson {
   [key: string]: any;
 }

packages/api/src/graphql/modules/QueryGraphqlModule.ts

@@ -0,0 +1,5 @@
+describe("placeholder", () => {
+  it("placeholder", () => {
+    expect(1).toBe(1);
+  });
+});

packages/api/test/no-tests-placeholder.test.ts

@@ -9,8 +9,8 @@
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint ./src ./test",
     "test:file": "node --experimental-vm-modules --experimental-wasm-modules --experimental-wasm-threads ../../node_modules/jest/bin/jest.js",
-    "test": "npm run test:file -- ./src/** ./test/**",
-    "test:watch": "npm run test:file -- ./src/** ./test/** --watch"
+    "test": "npm run test:file -- ./test/**",
+    "test:watch": "npm run test:file -- ./test/** --watch"
   },
   "publishConfig": {
     "access": "public"