From 942284480f2fc8da8bcc8cd793e0c1811d40d1d3 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 31 Oct 2014 13:44:44 +0100 Subject: [PATCH] Add Localhost, set regtest as default, remove relay as default --- src/main/java/io/bitsquare/SeedNode.java | 2 +- src/main/java/io/bitsquare/btc/BitcoinModule.java | 2 +- src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java | 2 +- src/main/java/io/bitsquare/msg/DefaultMessageModule.java | 2 +- src/main/java/io/bitsquare/msg/SeedNodeAddress.java | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/bitsquare/SeedNode.java b/src/main/java/io/bitsquare/SeedNode.java index a0ffff0ace..4dfde168d0 100644 --- a/src/main/java/io/bitsquare/SeedNode.java +++ b/src/main/java/io/bitsquare/SeedNode.java @@ -39,7 +39,7 @@ public class SeedNode extends Thread { public static void main(String[] args) { Peer peer = null; SeedNodeAddress.StaticSeedNodeAddresses seedNodeAddress = SeedNodeAddress.StaticSeedNodeAddresses - .DIGITAL_OCEAN1; + .LOCALHOST; try { peer = new PeerBuilder(Number160.createHash(seedNodeAddress.getId())).ports(seedNodeAddress.getPort()) .start(); diff --git a/src/main/java/io/bitsquare/btc/BitcoinModule.java b/src/main/java/io/bitsquare/btc/BitcoinModule.java index 9997669378..99bd59d0ab 100644 --- a/src/main/java/io/bitsquare/btc/BitcoinModule.java +++ b/src/main/java/io/bitsquare/btc/BitcoinModule.java @@ -32,7 +32,7 @@ public class BitcoinModule extends AbstractModule { private final BitcoinNetwork defaultNetwork; public BitcoinModule(Properties properties) { - this(properties, BitcoinNetwork.TESTNET); + this(properties, BitcoinNetwork.REGTEST); } public BitcoinModule(Properties properties, BitcoinNetwork defaultNetwork) { diff --git a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java index 1cb1c7a62e..0ccda2e99b 100644 --- a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java +++ b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java @@ -152,7 +152,7 @@ public class BootstrappedPeerFactory { FutureDiscover futureDiscover; // just temporary while port forwarding is not working - //lastSuccessfulBootstrap = "relay"; + lastSuccessfulBootstrap = "default"; switch (lastSuccessfulBootstrap) { case "relay": diff --git a/src/main/java/io/bitsquare/msg/DefaultMessageModule.java b/src/main/java/io/bitsquare/msg/DefaultMessageModule.java index 758e6a4677..106c87b452 100644 --- a/src/main/java/io/bitsquare/msg/DefaultMessageModule.java +++ b/src/main/java/io/bitsquare/msg/DefaultMessageModule.java @@ -41,6 +41,6 @@ public class DefaultMessageModule extends AbstractBitsquareModule implements Mes bind(SeedNodeAddress.StaticSeedNodeAddresses.class) .annotatedWith(Names.named("defaultSeedNode")) - .toInstance(SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN1); + .toInstance(SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST); } } diff --git a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java index c572d564f1..eb971973b5 100644 --- a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java +++ b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java @@ -57,7 +57,8 @@ public class SeedNodeAddress { public enum StaticSeedNodeAddresses { // Manfreds server: "188.226.179.109" // Steves server: "128.199.251.106" - DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000); + DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000), + LOCALHOST("localhost", "127.0.0.1", 5000); // DIGITAL_OCEAN2("digitalocean2.bitsquare.io", "128.199.251.106", 5000); //LOCALHOST("localhost", "127.0.0.1", 5000);