refactor: Refactor create community and store more data in backend

TryQuiet · Feb 23, 2024 · 5d86954 · 5d86954
1 parent 6322613
commit 5d86954
Show file tree

Hide file tree

Showing 28 changed files with 466 additions and 361 deletions.
diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.spec.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.spec.ts
@@ -96,17 +96,11 @@ describe('ConnectionsManagerService', () => {
       'QmZoiJNAvCffeEHBjk766nLuKVdkxkAT7wfFJDPPLsbKSE'
     )
     const launchCommunityPayload: InitCommunityPayload = {
-      id: community.id,
-      peerId: userIdentity.peerId,
-      hiddenService: userIdentity.hiddenService,
-      certs: {
-        // @ts-expect-error
-        certificate: userIdentity.userCertificate,
-        // @ts-expect-error
-        key: userIdentity.userCsr?.userKey,
-        CA: [communityRootCa],
+      network: {
+        peerId: userIdentity.peerId,
+        hiddenService: userIdentity.hiddenService,
       },
-      peers: [remotePeer],
+      community,
     }
 
     await localDbService.put(LocalDBKeys.COMMUNITY, launchCommunityPayload)
@@ -132,17 +126,11 @@ describe('ConnectionsManagerService', () => {
   // At this moment, that test have to be skipped, because checking statues is called before launchCommunity method
   it.skip('community is only launched once', async () => {
     const launchCommunityPayload: InitCommunityPayload = {
-      id: community.id,
-      peerId: userIdentity.peerId,
-      hiddenService: userIdentity.hiddenService,
-      certs: {
-        // @ts-expect-error
-        certificate: userIdentity.userCertificate,
-        // @ts-expect-error
-        key: userIdentity.userCsr?.userKey,
-        CA: [communityRootCa],
+      network: {
+        peerId: userIdentity.peerId,
+        hiddenService: userIdentity.hiddenService,
       },
-      peers: community.peerList,
+      community,
     }
 
     //@ts-ignore
@@ -158,17 +146,11 @@ describe('ConnectionsManagerService', () => {
 
   it('Bug reproduction - Error on startup - Error: TOR: Connection already established - Trigger launchCommunity from backend and state manager', async () => {
     const launchCommunityPayload: InitCommunityPayload = {
-      id: community.id,
-      peerId: userIdentity.peerId,
-      hiddenService: userIdentity.hiddenService,
-      certs: {
-        // @ts-expect-error
-        certificate: userIdentity.userCertificate,
-        // @ts-expect-error
-        key: userIdentity.userCsr?.userKey,
-        CA: [communityRootCa],
+      network: {
+        peerId: userIdentity.peerId,
+        hiddenService: userIdentity.hiddenService,
       },
-      peers: community.peerList,
+      community,
     }
 
     // await connectionsManager.init()

diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.tor.spec.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.tor.spec.ts
@@ -136,17 +136,11 @@ describe('Connections manager', () => {
     const emitSpy = jest.spyOn(libp2pService, 'emit')
 
     const launchCommunityPayload: InitCommunityPayload = {
-      id: community.id,
-      peerId: userIdentity.peerId,
-      hiddenService: userIdentity.hiddenService,
-      certs: {
-        // @ts-expect-error
-        certificate: userIdentity.userCertificate,
-        // @ts-expect-error
-        key: userIdentity.userCsr?.userKey,
-        CA: [communityRootCa],
+      network: {
+        peerId: userIdentity.peerId,
+        hiddenService: userIdentity.hiddenService,
       },
-      peers: community.peerList,
+      community,
     }
 
     await localDbService.put(LocalDBKeys.COMMUNITY, launchCommunityPayload)
@@ -207,18 +201,11 @@ describe('Connections manager', () => {
     }
 
     const launchCommunityPayload: InitCommunityPayload = {
-      id: community.id,
-      peerId: userIdentity.peerId,
-      hiddenService: userIdentity.hiddenService,
-      certs: {
-        // @ts-expect-error Identity.userCertificate can be null
-        certificate: userIdentity.userCertificate,
-        // @ts-expect-error Identity.userCertificate userCsr.userKey can be undefined
-        key: userIdentity.userCsr?.userKey,
-        // @ts-expect-error
-        CA: [community.rootCa],
+      network: {
+        peerId: userIdentity.peerId,
+        hiddenService: userIdentity.hiddenService,
       },
-      peers: peerList,
+      community,
     }
     await connectionsManagerService.init()
     await connectionsManagerService.launchCommunity(launchCommunityPayload)
@@ -249,18 +236,11 @@ describe('Connections manager', () => {
     }
 
     const launchCommunityPayload: InitCommunityPayload = {
-      id: community.id,
-      peerId: userIdentity.peerId,
-      hiddenService: userIdentity.hiddenService,
-      certs: {
-        // @ts-expect-error Identity.userCertificate can be null
-        certificate: userIdentity.userCertificate,
-        // @ts-expect-error
-        key: userIdentity.userCsr?.userKey,
-        // @ts-expect-error
-        CA: [community.rootCa],
+      network: {
+        peerId: userIdentity.peerId,
+        hiddenService: userIdentity.hiddenService,
       },
-      peers: peerList,
+      community,
     }
 
     await connectionsManagerService.launchCommunity(launchCommunityPayload)