fixing up test issues from rebase

MatrixAI · Nov 2, 2021 · 00fd0cf · 00fd0cf
1 parent 9a559d1
commit 00fd0cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 deletions.
diff --git a/src/client/clientService.ts b/src/client/clientService.ts
@@ -8,7 +8,6 @@ import type { NotificationsManager } from '../notifications';
 import type { Discovery } from '../discovery';
 import type { ForwardProxy, ReverseProxy } from '../network';
 import type { GRPCServer } from '../grpc';
-import { Sigchain } from '../sigchain';
 
 import { promisify } from 'util';
 import * as grpc from '@grpc/grpc-js';
@@ -17,14 +16,7 @@ import {
   IClientServiceServer,
 } from '../proto/js/polykey/v1/client_service_grpc_pb';
 import * as utilsPB from '../proto/js/polykey/v1/utils/utils_pb';
-import * as vaultsPB from '../proto/js/polykey/v1/vaults/vaults_pb';
 import * as nodesPB from '../proto/js/polykey/v1/nodes/nodes_pb';
-import * as notificationsPB from '../proto/js/polykey/v1/notifications/notifications_pb';
-import * as sessionsPB from '../proto/js/polykey/v1/sessions/sessions_pb';
-import * as gestaltsPB from '../proto/js/polykey/v1/gestalts/gestalts_pb';
-import * as identitiesPB from '../proto/js/polykey/v1/identities/identities_pb';
-import * as keysPB from '../proto/js/polykey/v1/keys/keys_pb';
-import * as permissionsPB from '../proto/js/polykey/v1/permissions/permissions_pb';
 import createEchoRPC from './rpcEcho';
 import createSessionRPC from './rpcSession';
 import createVaultRPC from './rpcVaults';
@@ -50,7 +42,6 @@ function createClientService({
   identitiesManager,
   gestaltGraph,
   sessionManager,
-  sigchain,
   notificationsManager,
   discovery,
   fwdProxy,
@@ -64,7 +55,6 @@ function createClientService({
   identitiesManager: IdentitiesManager;
   gestaltGraph: GestaltGraph;
   sessionManager: SessionManager;
-  sigchain: Sigchain;
   notificationsManager: NotificationsManager;
   discovery: Discovery;
   fwdProxy: ForwardProxy;
@@ -93,7 +83,6 @@ function createClientService({
     }),
     ...createIdentitiesRPC({
       identitiesManager,
-      sigchain,
       gestaltGraph,
       nodeManager,
       sessionManager,

diff --git a/src/client/rpcIdentities.ts b/src/client/rpcIdentities.ts
@@ -1,9 +1,7 @@
 import type { NodeManager } from '../nodes';
 import type { GestaltGraph } from '../gestalts';
 import type { SessionManager } from '../sessions';
-import type { Sigchain } from '../sigchain';
 import type { IdentitiesManager } from '../identities';
-import type { ClaimLinkIdentity, ClaimType } from '../claims/types';
 import type {
   IdentityId,
   ProviderId,
@@ -20,13 +18,11 @@ import * as identitiesPB from '../proto/js/polykey/v1/identities/identities_pb';
 
 const createIdentitiesRPC = ({
   identitiesManager,
-  sigchain,
   nodeManager,
   gestaltGraph,
   sessionManager,
 }: {
   identitiesManager: IdentitiesManager;
-  sigchain: Sigchain;
   nodeManager: NodeManager;
   gestaltGraph: GestaltGraph;
   sessionManager: SessionManager;
@@ -234,10 +230,10 @@ const createIdentitiesRPC = ({
      * Augments the keynode with a new identity.
      */
     identitiesClaim: async (
-      call: grpc.ServerUnaryCall<identitiesPB.Provider, utilsPB.EmptyMessage>,
-      callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
+      call: grpc.ServerUnaryCall<identitiesPB.Provider, identitiesPB.Claim>,
+      callback: grpc.sendUnaryData<identitiesPB.Claim>,
     ): Promise<void> => {
-      const response = new clientPB.IdentityClaimMessage();
+      const response = new identitiesPB.Claim();
       try {
         await sessionManager.verifyToken(utils.getToken(call.metadata));
         const responseMeta = utils.createMetaTokenResponse(
@@ -273,8 +269,7 @@ const createIdentitiesRPC = ({
       } catch (err) {
         callback(grpcUtils.fromError(err), null);
       }
-      const emptyMessage = new utilsPB.EmptyMessage();
-      callback(null, emptyMessage);
+      callback(null, response);
     },
   };
 };

diff --git a/tests/client/clientService.test.ts b/tests/client/clientService.test.ts
@@ -1597,7 +1597,7 @@ describe('Client service', () => {
     });
     test('should augment a keynode.', async () => {
       const identitiesAugmentKeynode =
-        grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
+        grpcUtils.promisifyUnaryCall<identitiesPB.Claim>(
           client,
           client.identitiesClaim,
         );