Fix merge

Author: vardhanapoorv

lib/client.d.ts

@@ -7,19 +7,11 @@ export declare class DgraphClient {
     private readonly clients;
     private debugMode;
     constructor(...clients: DgraphClientStub[]);
-    alter(
-        op: messages.Operation,
-        metadata?: grpc.Metadata | null,
-        options?: grpc.CallOptions | null
-    ): Promise<types.Payload>;
+    alter(op: messages.Operation, metadata?: grpc.Metadata | null, options?: grpc.CallOptions | null): Promise<types.Payload>;
     newTxn(txnOpts?: TxnOptions): Txn;
     setDebugMode(mode?: boolean): void;
     debug(msg: string): void;
     anyClient(): DgraphClientStub;
 }
 export declare function isJwtExpired(err: any): Boolean;
-export declare function deleteEdges(
-    mu: types.Mutation,
-    uid: string,
-    ...predicates: string[]
-): void;
+export declare function deleteEdges(mu: types.Mutation, uid: string, ...predicates: string[]): void;

lib/clientStub.d.ts

@@ -5,47 +5,14 @@ export declare class DgraphClientStub {
     private accessJwt;
     private refreshJwt;
     private readonly promisified;
-    constructor(
-        addr?: string,
-        credentials?: grpc.ChannelCredentials,
-        options?: object
-    );
-    login(
-        userid?: string,
-        password?: string,
-        refreshJwt?: string,
-        metadata?: grpc.Metadata,
-        options?: grpc.CallOptions
-    ): Promise<messages.Jwt>;
-    alter(
-        op: messages.Operation,
-        metadata?: grpc.Metadata,
-        options?: grpc.CallOptions
-    ): Promise<messages.Payload>;
-    retryLogin(
-        metadata?: grpc.Metadata,
-        options?: grpc.CallOptions
-    ): Promise<messages.Jwt>;
-    query(
-        req: messages.Request,
-        metadata?: grpc.Metadata,
-        options?: grpc.CallOptions
-    ): Promise<messages.Response>;
-    mutate(
-        mu: messages.Mutation,
-        metadata?: grpc.Metadata,
-        options?: grpc.CallOptions
-    ): Promise<messages.Response>;
-    commitOrAbort(
-        ctx: messages.TxnContext,
-        metadata?: grpc.Metadata,
-        options?: grpc.CallOptions
-    ): Promise<messages.TxnContext>;
-    checkVersion(
-        check: messages.Check,
-        metadata?: grpc.Metadata,
-        options?: grpc.CallOptions
-    ): Promise<messages.Version>;
+    constructor(addr?: string, credentials?: grpc.ChannelCredentials, options?: object);
+    login(userid?: string, password?: string, refreshJwt?: string, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Jwt>;
+    alter(op: messages.Operation, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Payload>;
+    retryLogin(metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Jwt>;
+    query(req: messages.Request, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Response>;
+    mutate(mu: messages.Mutation, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Response>;
+    commitOrAbort(ctx: messages.TxnContext, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.TxnContext>;
+    checkVersion(check: messages.Check, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Version>;
     waitForReady(deadline: grpc.Deadline): Promise<void>;
     close(): void;
     grpcClient(): grpc.Client;