Ensure cache is outside of hash verifying storage!

Can now log in to remote server in < 2s.
didlie-dev · Sep 4, 2019 · d75b881 · d75b881
1 parent d80cb35
commit d75b881
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/peergos/shared/NetworkAccess.java b/src/peergos/shared/NetworkAccess.java
@@ -104,7 +104,7 @@ public static CoreNode buildDirectCorenode(HttpPoster poster) {
     }
 
     public static ContentAddressedStorage buildLocalDht(HttpPoster apiPoster, boolean isPeergosServer) {
-        return new CachingStorage(new ContentAddressedStorage.HTTP(apiPoster, isPeergosServer), 1_000, 50 * 1024);
+        return new ContentAddressedStorage.HTTP(apiPoster, isPeergosServer);
     }
 
     @JsMethod
@@ -180,9 +180,11 @@ private static CompletableFuture<NetworkAccess> build(CoreNode core,
                 .exceptionally(t -> new Multihash(Multihash.Type.sha2_256, new byte[32]))
                 .thenApply(nodeId -> {
                     ContentAddressedStorageProxy proxingDht = new ContentAddressedStorageProxy.HTTP(p2pPoster);
-                    ContentAddressedStorage p2pDht = isPeergosServer ?
+                    ContentAddressedStorage storage = isPeergosServer ?
                             localDht :
                             new ContentAddressedStorage.Proxying(localDht, proxingDht, nodeId, core);
+                    HashVerifyingStorage verifyingStorage = new HashVerifyingStorage(storage, isJavascript ? new ScryptJS() : new ScryptJava());
+                    ContentAddressedStorage p2pDht = new CachingStorage(verifyingStorage, 1_000, 50 * 1024);
                     MutablePointersProxy httpMutable = new HttpMutablePointers(apiPoster, p2pPoster);
                     MutablePointers p2pMutable =
                             isPeergosServer ?
@@ -211,8 +213,7 @@ private static NetworkAccess build(ContentAddressedStorage dht,
                                        boolean isJavascript) {
         WriteSynchronizer synchronizer = new WriteSynchronizer(mutable, dht);
         MutableTree btree = new MutableTreeImpl(mutable, dht, synchronizer);
-        HashVerifyingStorage dhtClient = new HashVerifyingStorage(dht, isJavascript ? new ScryptJS() : new ScryptJava());
-        return new NetworkAccess(coreNode, social, dhtClient, mutable, btree, synchronizer, instanceAdmin, usage, usernames, isJavascript);
+        return new NetworkAccess(coreNode, social, dht, mutable, btree, synchronizer, instanceAdmin, usage, usernames, isJavascript);
     }
 
     public static CompletableFuture<NetworkAccess> buildJava(URL target) {