From 396fd089ca18f0b73886989b344bce3bfe635053 Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Mon, 10 Nov 2014 12:53:13 +0100
Subject: [PATCH] Eliminate the option to use TomP2P disk storage (for now)

In practice we always use TomP2P's in-memory storage. Eliminate the
useDiskStorage option for now, in order to simplify the ongoing
refactoring efforts.
---
 .../msg/tomp2p/TomP2PMessageModule.java       |  1 -
 .../io/bitsquare/msg/tomp2p/TomP2PNode.java   | 35 +------------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
index ba56742fb6..5f6197dd9b 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
@@ -43,7 +43,6 @@ public class TomP2PMessageModule extends MessageModule {
     protected void doConfigure() {
         bind(int.class).annotatedWith(Names.named(Node.PORT_KEY)).toInstance(
             Integer.valueOf(properties.getProperty(Node.PORT_KEY, String.valueOf(Node.DEFAULT_PORT))));
-        bind(boolean.class).annotatedWith(Names.named(TomP2PNode.USE_DISK_STORAGE_KEY)).toInstance(false);
         bind(TomP2PNode.class).asEagerSingleton();
 
         bind(Node.class).annotatedWith(Names.named(BOOTSTRAP_NODE_KEY)).toInstance(
diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
index b6b326f698..8df10e3ecf 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
@@ -28,7 +28,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 
 import com.google.inject.name.Named;
 
-import java.io.File;
 import java.io.IOException;
 
 import java.security.KeyPair;
@@ -43,13 +42,11 @@ import javax.inject.Inject;
 
 import javafx.application.Platform;
 
-import net.tomp2p.connection.DSASignatureFactory;
 import net.tomp2p.connection.PeerConnection;
 import net.tomp2p.dht.FutureGet;
 import net.tomp2p.dht.FuturePut;
 import net.tomp2p.dht.FutureRemove;
 import net.tomp2p.dht.PeerDHT;
-import net.tomp2p.dht.StorageMemory;
 import net.tomp2p.futures.BaseFuture;
 import net.tomp2p.futures.BaseFutureListener;
 import net.tomp2p.futures.FutureDirect;
@@ -58,7 +55,6 @@ import net.tomp2p.peers.Number160;
 import net.tomp2p.peers.PeerAddress;
 import net.tomp2p.storage.Data;
 import net.tomp2p.storage.Storage;
-import net.tomp2p.storage.StorageDisk;
 import net.tomp2p.utils.Utils;
 
 import org.jetbrains.annotations.NotNull;
@@ -66,8 +62,6 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import lighthouse.files.AppDirectory;
-
 import static io.bitsquare.util.tomp2p.BaseFutureUtil.isSuccess;
 
 /**
@@ -79,12 +73,8 @@ import static io.bitsquare.util.tomp2p.BaseFutureUtil.isSuccess;
 public class TomP2PNode {
     private static final Logger log = LoggerFactory.getLogger(TomP2PNode.class);
 
-    static final String USE_DISK_STORAGE_KEY = "useDiskStorage";
-
     private KeyPair keyPair;
-    private String appName;
     private final int port;
-    private final Boolean useDiskStorage;
     private MessageBroker messageBroker;
 
     private PeerAddress storedPeerAddress;
@@ -98,14 +88,9 @@ public class TomP2PNode {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public TomP2PNode(BootstrappedPeerFactory bootstrappedPeerFactory,
-                      @Named("appName") String appName,
-                      @Named(Node.PORT_KEY) int port,
-                      @Named(USE_DISK_STORAGE_KEY) Boolean useDiskStorage) {
+    public TomP2PNode(BootstrappedPeerFactory bootstrappedPeerFactory, @Named(Node.PORT_KEY) int port) {
         this.bootstrappedPeerFactory = bootstrappedPeerFactory;
-        this.appName = appName;
         this.port = port;
-        this.useDiskStorage = useDiskStorage;
     }
 
     // for unit testing
@@ -116,7 +101,6 @@ public class TomP2PNode {
         messageBroker = (message, peerAddress) -> {
         };
         port = Node.DEFAULT_PORT;
-        useDiskStorage = false;
     }
 
 
@@ -134,8 +118,6 @@ public class TomP2PNode {
     }
 
     public void start(BootstrapListener bootstrapListener) {
-        useDiskStorage(useDiskStorage);
-
         bootstrappedPeerFactory.setStorage(storage);
         setupTimerForIPCheck();
 
@@ -398,19 +380,4 @@ public class TomP2PNode {
         log.debug("storePeerAddress " + peerDHT.peerAddress().toString());
         return putDomainProtectedData(locationKey, data);
     }
-
-    private void useDiskStorage(boolean useDiskStorage) {
-        if (useDiskStorage) {
-            File path = new File(AppDirectory.dir(appName).toFile() + "/tomP2P");
-            if (!path.exists()) {
-                boolean created = path.mkdir();
-                if (!created)
-                    throw new RuntimeException("Could not create the directory '" + path + "'");
-            }
-            storage = new StorageDisk(Number160.ZERO, path, new DSASignatureFactory());
-        }
-        else {
-            storage = new StorageMemory();
-        }
-    }
 }