Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-19 20:34:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use local seed node

Browse source
This commit is contained in:
Manfred Karrer 2014-10-06 14:45:49 +02:00
parent f485afec19
commit e054b2ef3d
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ 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.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;
@ -104,8 +105,8 @@ class MainModel extends UIModel {
// For testing with the serverside seednode we need the BootstrappedPeerFactory which gets started form // For testing with the serverside seednode we need the BootstrappedPeerFactory which gets started form
// messageFacade.init // messageFacade.init
/*dhtSeedService.setHandler(m -> { dhtSeedService.setHandler(m -> {
if (m instanceof PeerInitialized) { if (m instanceof PeerInitialized) {
log.debug("dht seed initialized. "); log.debug("dht seed initialized. ");
// init messageFacade after seed node initialized // init messageFacade after seed node initialized
@ -124,9 +125,9 @@ class MainModel extends UIModel {
} }
}); });
dhtSeedService.initializePeer();*/ dhtSeedService.initializePeer();
messageFacade.init(new BootstrapListener() { /* messageFacade.init(new BootstrapListener() {
@Override @Override
public void onCompleted() { public void onCompleted() {
messageFacadeInited = true; messageFacadeInited = true;
@ -137,7 +138,7 @@ class MainModel extends UIModel {
public void onFailed(Throwable throwable) { public void onFailed(Throwable throwable) {
log.error(throwable.toString()); log.error(throwable.toString());
} }
}); });*/
Profiler.printMsgWithTime("MainModel.initFacades"); Profiler.printMsgWithTime("MainModel.initFacades");

2
src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
View file

@ -24,6 +24,6 @@
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="withdrawalTab" text="Open for withdrawal" closable="false"/> <Tab fx:id="withdrawalTab" text="Open for withdrawal" closable="false"/>
<Tab fx:id="transactionsTab" text="History" closable="false"/> <Tab fx:id="transactionsTab" text="Transactions" closable="false"/>
</TabPane> </TabPane>

3
src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java
View file

@ -17,7 +17,6 @@
package io.bitsquare.gui.main.orders.pending; package io.bitsquare.gui.main.orders.pending;
import io.bitsquare.btc.FeePolicy;
import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
@ -151,7 +150,7 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
} }
String getAmountToWithdraw() { String getAmountToWithdraw() {
return formatter.formatCoinWithCode(model.getAmountToWithdraw().subtract(FeePolicy.TX_FEE)); return formatter.formatCoinWithCode(model.getAmountToWithdraw()); //.subtract(FeePolicy.TX_FEE));
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////

2
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
View file

@ -285,6 +285,8 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
private void close() { private void close() {
TabPane tabPane = ((TabPane) (root.getParent().getParent())); TabPane tabPane = ((TabPane) (root.getParent().getParent()));
tabPane.getTabs().remove(tabPane.getSelectionModel().getSelectedItem()); tabPane.getTabs().remove(tabPane.getSelectionModel().getSelectedItem());
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.OFFERS);
} }

3
src/main/resources/i18n/displayStrings.properties
View file

@ -71,7 +71,8 @@ createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts). createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
createOffer.success.headline=Your offer has been successfully published to the distributed offerbook. createOffer.success.headline=Your offer has been successfully published to the distributed offerbook.
createOffer.success.info=The Transaction ID for the offer payment is: {0} createOffer.success.info=The Transaction ID for the offer payment is: {0}\n\nIn the Offers screen you can manage your\
open offers.
createOffer.error.message=An error occurred when placing the offer.\n{0} createOffer.error.message=An error occurred when placing the offer.\n{0}