Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-12-15 07:52:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merged seedpeer branch with master branch, cleanup

Browse source
This commit is contained in:
Steve Myers 2014-10-12 14:56:52 -07:00
parent f8b9408514
commit bec9a68750
3 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/io/bitsquare/di/BitSquareModule.java
View file

@ -119,14 +119,15 @@ class StaticSeedNodeAddressesProvider implements Provider<SeedNodeAddress.Static
String seedNodeFromConfig = BitSquareModule.properties.getProperty("defaultSeedNode"); String seedNodeFromConfig = BitSquareModule.properties.getProperty("defaultSeedNode");
// Set default // Set default
SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST; //SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST;
// SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN; SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN1;
// if defined in config we override the above // if defined in config we override the above
if (seedNodeFromConfig != null) // if (seedNodeFromConfig != null)
seedNode = seedNodeFromConfig.equals("localhost") ? // seedNode = seedNodeFromConfig.equals("localhost") ?
SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST : // SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST :
SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN; // SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN;
return seedNode; return seedNode;
} }
} }

27
src/main/java/io/bitsquare/gui/main/MainModel.java
View file

@ -21,9 +21,7 @@ import io.bitsquare.bank.BankAccount;
import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.UIModel; import io.bitsquare.gui.UIModel;
import io.bitsquare.gui.util.Profiler; import io.bitsquare.gui.util.Profiler;
import io.bitsquare.msg.DHTSeedService;
import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.MessageFacade;
import io.bitsquare.msg.actor.event.PeerInitialized;
import io.bitsquare.msg.listeners.BootstrapListener; import io.bitsquare.msg.listeners.BootstrapListener;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.Trade; import io.bitsquare.trade.Trade;
@ -54,7 +52,6 @@ class MainModel extends UIModel {
private static final Logger log = LoggerFactory.getLogger(MainModel.class); private static final Logger log = LoggerFactory.getLogger(MainModel.class);
private final User user; private final User user;
private final DHTSeedService dhtSeedService;
private final WalletFacade walletFacade; private final WalletFacade walletFacade;
private final MessageFacade messageFacade; private final MessageFacade messageFacade;
private final TradeManager tradeManager; private final TradeManager tradeManager;
@ -73,10 +70,9 @@ class MainModel extends UIModel {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@Inject @Inject
private MainModel(User user, DHTSeedService dhtSeedService, WalletFacade walletFacade, MessageFacade messageFacade, private MainModel(User user, WalletFacade walletFacade, MessageFacade messageFacade,
TradeManager tradeManager, Persistence persistence) { TradeManager tradeManager, Persistence persistence) {
this.user = user; this.user = user;
this.dhtSeedService = dhtSeedService;
this.walletFacade = walletFacade; this.walletFacade = walletFacade;
this.messageFacade = messageFacade; this.messageFacade = messageFacade;
this.tradeManager = tradeManager; this.tradeManager = tradeManager;
@ -185,31 +181,18 @@ class MainModel extends UIModel {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
private void onFacadesInitialised() { private void onFacadesInitialised() {
// TODO Consider to use version sync notification pane from Mike Hearn
walletFacade.addDownloadListener(new WalletFacade.DownloadListener() {
@Override
public void progress(double percent) {
networkSyncProgress.set(percent);
}
@Override
public void downloadComplete() {
networkSyncComplete.set(true);
}
});
tradeManager.getPendingTrades().addListener((MapChangeListener<String, tradeManager.getPendingTrades().addListener((MapChangeListener<String,
Trade>) change -> updateNumPendingTrades()); Trade>) change -> updateNumPendingTrades());
updateNumPendingTrades(); updateNumPendingTrades();
backendInited.set(true); facadesInitialised = true;
if (networkSyncProgress.get() >= 1.0)
backendReady.set(true);
} }
private void updateNumPendingTrades() { private void updateNumPendingTrades() {
numPendingTrades.set(tradeManager.getPendingTrades().size()); numPendingTrades.set(tradeManager.getPendingTrades().size());
} }
/* private void updateBalance(Coin balance) {
this.balance.set(balance);
}*/
} }

5
src/main/java/io/bitsquare/msg/SeedNodeAddress.java
View file

@ -55,8 +55,9 @@ public class SeedNodeAddress {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public enum StaticSeedNodeAddresses { public enum StaticSeedNodeAddresses {
LOCALHOST("localhost", "127.0.0.1", 5001), DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000),
DIGITAL_OCEAN("digitalocean.bitsquare.io", "188.226.179.109", 5000); DIGITAL_OCEAN2("digitalocean2.bitsquare.io", "128.199.251.106", 5000),
LOCALHOST("localhost", "127.0.0.1", 5001);
private final String id; private final String id;
private final String ip; private final String ip;