fixes #305

MatrixAI · Mar 8, 2022 · dc39fd2 · dc39fd2
1 parent f28aea6
commit dc39fd2
Show file tree

Hide file tree

Showing 3 changed files with 251 additions and 69 deletions.
diff --git a/src/vaults/VaultInternal.ts b/src/vaults/VaultInternal.ts
@@ -515,7 +515,7 @@ class VaultInternal {
       remoteInfo.remoteNode = nodesUtils.encodeNodeId(pullNodeId);
     }
     if (pullVaultNameOrId == null) {
-      pullVaultNameOrId = vaultsUtils.decodeVaultId(remoteInfo.remoteVault!);
+      pullVaultNameOrId = vaultsUtils.decodeVaultId(remoteInfo.remoteVault!)!;
     } else {
       metaChange = 1;
       if (typeof pullVaultNameOrId === 'string') {
@@ -529,7 +529,7 @@ class VaultInternal {
         this.vaultId,
       )} from Node ${pullNodeId}`,
     );
-    let remoteVaultId: VaultIdEncoded;
+    let remoteVaultId: VaultId;
     try {
       remoteVaultId = await nodeConnectionManager.withConnF(
         pullNodeId!,
@@ -568,7 +568,9 @@ class VaultInternal {
       throw err;
     }
     if (metaChange !== 0) {
-      if (metaChange === 2) remoteInfo.remoteVault = remoteVaultId;
+      if (metaChange === 2) {
+        remoteInfo.remoteVault = vaultsUtils.encodeVaultId(remoteVaultId);
+      }
       await this.db.put(
         this.vaultMetadataDbDomain,
         VaultInternal.remoteKey,

diff --git a/src/vaults/VaultManager.ts b/src/vaults/VaultManager.ts
@@ -783,7 +783,6 @@ class VaultManager {
   }
 
   @ready(new vaultsErrors.ErrorVaultManagerNotRunning())
-  // TODO: write a test for this, check if it actually handles conflicts
   protected async generateVaultId(): Promise<VaultId> {
     let vaultId = vaultsUtils.generateVaultId();
     let i = 0;