Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-09-23 14:34:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Eliminate the option to use TomP2P disk storage (for now)

Browse source 
In practice we always use TomP2P's in-memory storage. Eliminate the
useDiskStorage option for now, in order to simplify the ongoing
refactoring efforts.
This commit is contained in:
Chris Beams 2014-11-10 12:53:13 +01:00
parent 737d1855d1
commit 396fd089ca
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
2 changed files with 1 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
View file

@ -43,7 +43,6 @@ public class TomP2PMessageModule extends MessageModule {
protected void doConfigure() { protected void doConfigure() {
bind(int.class).annotatedWith(Names.named(Node.PORT_KEY)).toInstance( bind(int.class).annotatedWith(Names.named(Node.PORT_KEY)).toInstance(
Integer.valueOf(properties.getProperty(Node.PORT_KEY, String.valueOf(Node.DEFAULT_PORT)))); 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(TomP2PNode.class).asEagerSingleton();
bind(Node.class).annotatedWith(Names.named(BOOTSTRAP_NODE_KEY)).toInstance( bind(Node.class).annotatedWith(Names.named(BOOTSTRAP_NODE_KEY)).toInstance(

35
src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
View file

@ -28,7 +28,6 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.inject.name.Named; import com.google.inject.name.Named;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.security.KeyPair; import java.security.KeyPair;
@ -43,13 +42,11 @@ import javax.inject.Inject;
import javafx.application.Platform; import javafx.application.Platform;
import net.tomp2p.connection.DSASignatureFactory;
import net.tomp2p.connection.PeerConnection; import net.tomp2p.connection.PeerConnection;
import net.tomp2p.dht.FutureGet; import net.tomp2p.dht.FutureGet;
import net.tomp2p.dht.FuturePut; import net.tomp2p.dht.FuturePut;
import net.tomp2p.dht.FutureRemove; import net.tomp2p.dht.FutureRemove;
import net.tomp2p.dht.PeerDHT; import net.tomp2p.dht.PeerDHT;
import net.tomp2p.dht.StorageMemory;
import net.tomp2p.futures.BaseFuture; import net.tomp2p.futures.BaseFuture;
import net.tomp2p.futures.BaseFutureListener; import net.tomp2p.futures.BaseFutureListener;
import net.tomp2p.futures.FutureDirect; import net.tomp2p.futures.FutureDirect;
@ -58,7 +55,6 @@ import net.tomp2p.peers.Number160;
import net.tomp2p.peers.PeerAddress; import net.tomp2p.peers.PeerAddress;
import net.tomp2p.storage.Data; import net.tomp2p.storage.Data;
import net.tomp2p.storage.Storage; import net.tomp2p.storage.Storage;
import net.tomp2p.storage.StorageDisk;
import net.tomp2p.utils.Utils; import net.tomp2p.utils.Utils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -66,8 +62,6 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import lighthouse.files.AppDirectory;
import static io.bitsquare.util.tomp2p.BaseFutureUtil.isSuccess; import static io.bitsquare.util.tomp2p.BaseFutureUtil.isSuccess;
/** /**
@ -79,12 +73,8 @@ import static io.bitsquare.util.tomp2p.BaseFutureUtil.isSuccess;
public class TomP2PNode { public class TomP2PNode {
private static final Logger log = LoggerFactory.getLogger(TomP2PNode.class); private static final Logger log = LoggerFactory.getLogger(TomP2PNode.class);
static final String USE_DISK_STORAGE_KEY = "useDiskStorage";
private KeyPair keyPair; private KeyPair keyPair;
private String appName;
private final int port; private final int port;
private final Boolean useDiskStorage;
private MessageBroker messageBroker; private MessageBroker messageBroker;
private PeerAddress storedPeerAddress; private PeerAddress storedPeerAddress;
@ -98,14 +88,9 @@ public class TomP2PNode {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@Inject @Inject
public TomP2PNode(BootstrappedPeerFactory bootstrappedPeerFactory, public TomP2PNode(BootstrappedPeerFactory bootstrappedPeerFactory, @Named(Node.PORT_KEY) int port) {
@Named("appName") String appName,
@Named(Node.PORT_KEY) int port,
@Named(USE_DISK_STORAGE_KEY) Boolean useDiskStorage) {
this.bootstrappedPeerFactory = bootstrappedPeerFactory; this.bootstrappedPeerFactory = bootstrappedPeerFactory;
this.appName = appName;
this.port = port; this.port = port;
this.useDiskStorage = useDiskStorage;
} }
// for unit testing // for unit testing
@ -116,7 +101,6 @@ public class TomP2PNode {
messageBroker = (message, peerAddress) -> { messageBroker = (message, peerAddress) -> {
}; };
port = Node.DEFAULT_PORT; port = Node.DEFAULT_PORT;
useDiskStorage = false;
} }
@ -134,8 +118,6 @@ public class TomP2PNode {
} }
public void start(BootstrapListener bootstrapListener) { public void start(BootstrapListener bootstrapListener) {
useDiskStorage(useDiskStorage);
bootstrappedPeerFactory.setStorage(storage); bootstrappedPeerFactory.setStorage(storage);
setupTimerForIPCheck(); setupTimerForIPCheck();
@ -398,19 +380,4 @@ public class TomP2PNode {
log.debug("storePeerAddress " + peerDHT.peerAddress().toString()); log.debug("storePeerAddress " + peerDHT.peerAddress().toString());
return putDomainProtectedData(locationKey, data); 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();
}
}
} }