fix failing tests

Author: shivaji-kharse

.eslintrc.js

@@ -275,7 +275,7 @@ module.exports = {
         "max-len": [
             "error",
             {
-                "code": 140
+                "code": 160
             }
         ],
         "max-lines": "off",

package.json

@@ -35,9 +35,8 @@
   "devDependencies": {
     "@types/google-protobuf": "^3.15.12",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.2",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/eslint-plugin-tslint": "^7.0.2",
+    "@types/node": "^20.14.4",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
     "@typescript-eslint/parser": "^7.13.0",
     "coveralls": "^3.1.1",
     "eslint": "^8.57.0",
@@ -63,8 +62,11 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.10.9",
     "@types/url-parse": "^1.4.11",
+    "@typescript-eslint/eslint-plugin-tslint": "^6.21.0",
+    "dgraph-js": "^21.3.1",
     "eslint-plugin-lodash": "^7.4.0",
     "google-protobuf": "^3.21.2",
+    "grpc": "^1.24.11",
     "is-base64": "^1.1.0",
     "url-parse": "^1.5.10"
   }

src/client.ts

@@ -48,7 +48,7 @@ export class DgraphClient {
 
         const c = this.anyClient();
         let payload: messages.Payload;
-        const operation = async (): Promise<messages.Payload> => c.alter(op, metadata, options);
+        const operation = async () => c.alter(op, metadata, options);
         try {
             payload = await operation();
         } catch (e) {

src/clientStubFromSlash.ts

@@ -11,14 +11,14 @@ const PORT = "443";
 export function clientStubFromSlashGraphQLEndpoint(
     graphqlEndpoint: string,
     apiKey: string,
-): DgraphClientStub {
+) {
     return clientStubFromCloudEndpoint(graphqlEndpoint, apiKey);
 }
 
 export function clientStubFromCloudEndpoint(
     graphqlEndpoint: string,
     apiKey: string,
-): DgraphClientStub  {
+)  {
     const url = new Url(graphqlEndpoint);
     const urlParts = url.host.split(".");
     const firstHalf = urlParts[0];

src/txn.ts

@@ -217,7 +217,7 @@ export class Txn {
 
         let resp: types.Response;
         const c = this.dc.anyClient();
-        const operation = async (): Promise<messages.Response> => c.query(req, metadata, options);
+        const operation = async () => c.query(req, metadata, options);
         try {
             resp = types.createResponse(await operation());
         } catch (e) {
@@ -274,7 +274,7 @@ export class Txn {
         }
 
         const c = this.dc.anyClient();
-        const operation = async (): Promise<messages.TxnContext> =>
+        const operation = async () =>
             c.commitOrAbort(this.ctx, metadata, options);
         try {
             await operation();
@@ -313,7 +313,7 @@ export class Txn {
 
         this.ctx.setAborted(true);
         const c = this.dc.anyClient();
-        const operation = async (): Promise<messages.TxnContext> =>
+        const operation = async () =>
             c.commitOrAbort(this.ctx, metadata, options);
         try {
             await operation();

tests/clientStub.spec.ts

@@ -4,7 +4,7 @@ import * as dgraph from "../src";
 
 import { SERVER_ADDR, SERVER_CREDENTIALS, setup } from "./helper";
 
-function validateVersionObject(version: dgraph.Version): void {
+function validateVersionObject(version: dgraph.Version){
     const tag = version.getTag();
     expect(typeof tag).toEqual("string");
     expect(tag).toBeDefined();

tests/integration/acl.spec.ts

@@ -1,3 +1,4 @@
+import { fail } from "assert";
 import { exec } from "child_process";
 import { promisify } from "util";
 
@@ -28,15 +29,15 @@ const MUTATE_PERMISSION_DENIED = new Error(`7 PERMISSION_DENIED:\
 const ALTER_PERMISSION_DENIED = new Error(`7 PERMISSION_DENIED:\
  unauthorized to alter following predicates: ${PRED} \n`);
 
-async function cmd(command: string): Promise<void>{
+async function cmd(command: string){
     try {
         await execute(command);
     } catch (err) {
         fail(`Failed to execute command:\n\t${command}\nError: ${err}`);
     }
 }
 
-async function insertSampleData(): Promise<void> {
+async function insertSampleData() {
     const txn = client.newTxn();
     const mu = new dgraph.Mutation();
     mu.setSetNquads(`
@@ -48,7 +49,7 @@ async function insertSampleData(): Promise<void> {
     expect(uid).toBeDefined();
 }
 
-async function loginUser(): Promise<dgraph.DgraphClient> {
+async function loginUser() {
     const aclClientStub = createClientStub();
     try {
         await aclClientStub.login(USERID, USERPWD);
@@ -58,7 +59,7 @@ async function loginUser(): Promise<dgraph.DgraphClient> {
     return createClient(aclClientStub);
 }
 
-async function aclSetup(): Promise<dgraph.DgraphClient> {
+async function aclSetup() {
     client = await setup();
     await setSchema(client, `
         ${PRED}: string .
@@ -70,24 +71,23 @@ async function aclSetup(): Promise<dgraph.DgraphClient> {
     return loginUser();
 }
 
-async function addUser(): Promise<void> {
+async function addUser() {
     const command = `dgraph acl -a \'${SERVER_ADDR}\' add -u \'${USERID}\' -p \'${USERPWD}\' --guardian-creds \'${GUARDIAN_CREDS}\'`;
     await cmd(command);
 }
 
-async function addGroup(): Promise<void> {
+async function addGroup(){
     const command = `dgraph acl -a \'${SERVER_ADDR}\' add -g \'${DEV_GROUP}\' --guardian-creds \'${GUARDIAN_CREDS}\'`;
     await cmd(command);
 }
 
-async function addUserToGroup(): Promise<void> {
+async function addUserToGroup() {
     const command = `dgraph acl -a \'${SERVER_ADDR}\' mod -u \'${USERID}\' -l \'${DEV_GROUP}\' --guardian-creds \'${GUARDIAN_CREDS}\'`;
     await cmd(command);
 }
 
-async function changePermission(permission: number): Promise<void> {
-    const command = `dgraph acl -a \'${SERVER_ADDR}\' mod -g \'${DEV_GROUP}\' -p \'${PRED}\' -m \'${permission}\'
-     --guardian-creds \'${GUARDIAN_CREDS}\'`;
+async function changePermission(permission: number){
+    const command = `dgraph acl -a \'${SERVER_ADDR}\' mod -g \'${DEV_GROUP}\' -p \'${PRED}\' -m \'${permission}\' --guardian-creds \'${GUARDIAN_CREDS}\'`;
     await cmd(command);
     await wait(WAIT_FOR_SIX_SECONDS);
 }