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

Cleanup

Browse Source
This commit is contained in:
Manfred Karrer 2015-03-12 18:46:16 +01:00
parent 87539db93d
commit e1a9fd479e
12 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
View File

@ -79,7 +79,7 @@ class OffersDataModel implements Activatable, DataModel {
}
void removeOpenOffer(String offerId, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
tradeManager.onRemoveOpenOfferRequested(offerId, resultHandler, errorMessageHandler);
tradeManager.removeOpenOffer(offerId, resultHandler, errorMessageHandler);
}

2
gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
View File

@ -200,7 +200,7 @@ class PendingTradesDataModel implements Activatable, DataModel {
log.error(e.getMessage());
}
tradeManager.onCloseTradeRequested(getTrade());
tradeManager.closeTrade(getTrade());
/*
Action response = Popups.openConfirmPopup(

2
gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
View File

@ -172,7 +172,7 @@ class CreateOfferDataModel implements Activatable, DataModel {
void placeOffer() {
// data validation is done in the trade domain
tradeManager.onPlaceOfferRequested(offerId,
tradeManager.placeOffer(offerId,
direction,
priceAsFiat.get(),
amountAsCoin.get(),

2
gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
View File

@ -115,7 +115,7 @@ class OfferBookDataModel implements Activatable, DataModel {
}
void removeOpenOffer(String offerId, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
tradeManager.onRemoveOpenOfferRequested(offerId, resultHandler, errorMessageHandler);
tradeManager.removeOpenOffer(offerId, resultHandler, errorMessageHandler);
}
void calculateVolume() {

6
gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
View File

@ -103,7 +103,7 @@ class TakeOfferDataModel implements Activatable, DataModel {
@Override
public void deactivate() {
btcCode.unbind();
tradeManager.onGetOfferAvailableStateRequestCanceled(offer);
tradeManager.cancelGetOfferAvailableStateRequest(offer);
}
void initWithData(Coin amount, Offer offer) {
@ -134,11 +134,11 @@ class TakeOfferDataModel implements Activatable, DataModel {
offer.getStateProperty().addListener((observable, oldValue, newValue) -> {
offerIsAvailable.set(newValue);
});
tradeManager.onCheckOfferAvailability(offer);
tradeManager.checkOfferAvailability(offer);
}
void takeOffer() {
final Trade trade = tradeManager.onTakeOfferRequested(amountAsCoin.get(), offer);
final Trade trade = tradeManager.takeOffer(amountAsCoin.get(), offer);
trade.stateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("trade state = " + newValue);
switch (newValue) {

7
gui/src/main/java/io/bitsquare/persistence/Persistence.java
View File

@ -53,9 +53,11 @@ public class Persistence {
public static final String DIR_KEY = "persistence.dir";
public static final String PREFIX_KEY = "persistence.prefix";
private static final long MIN_INTERVAL_BETWEEN_WRITE_OPERATIONS = 1000;
@GuardedBy("lock")
private Map<String, Serializable> rootMap = new HashMap<>();
private Map<String, Long> timestampMap = new HashMap<>();
private final File dir;
private final String prefix;
@ -133,7 +135,9 @@ public class Persistence {
}
public void write(String key, Serializable value) {
// log.trace("Write object with key = " + key + " / value = " + value);
//log.trace("Write object with key = " + key + " / value = " + value);
// TODO add throttle to limit write operations
try {
lock.lock();
rootMap.put(key, value);
@ -143,7 +147,6 @@ public class Persistence {
}
}
public Serializable read(Object classInstance) {
return read(classInstance.getClass().getName());
}

65
gui/src/main/java/io/bitsquare/trade/TradeManager.java
View File

@ -60,10 +60,6 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* The domain for the trading
* TODO: Too messy, need to be improved a lot....
*/
public class TradeManager {
private static final Logger log = LoggerFactory.getLogger(TradeManager.class);
@ -76,7 +72,6 @@ public class TradeManager {
private final SignatureService signatureService;
private final OfferBookService offerBookService;
//TODO store TakerAsSellerProtocol in trade
private final Map<String, SellerAsTakerProtocol> takerAsSellerProtocolMap = new HashMap<>();
private final Map<String, BuyerAsOffererProtocol> offererAsBuyerProtocolMap = new HashMap<>();
private final Map<String, CheckOfferAvailabilityProtocol> checkOfferAvailabilityProtocolMap = new HashMap<>();
@ -85,7 +80,6 @@ public class TradeManager {
private final ObservableMap<String, Trade> pendingTrades = FXCollections.observableHashMap();
private final ObservableMap<String, Trade> closedTrades = FXCollections.observableHashMap();
// the latest pending trade
private Trade currentPendingTrade;
@ -130,32 +124,35 @@ public class TradeManager {
// Called from UI
///////////////////////////////////////////////////////////////////////////////////////////
public void onCheckOfferAvailability(Offer offer) {
public void checkOfferAvailability(Offer offer) {
if (!checkOfferAvailabilityProtocolMap.containsKey(offer.getId())) {
CheckOfferAvailabilityModel model = new CheckOfferAvailabilityModel(offer, tradeMessageService, () -> {
});
CheckOfferAvailabilityModel model = new CheckOfferAvailabilityModel(
offer,
tradeMessageService,
() -> disposeCheckOfferAvailabilityRequest(offer));
CheckOfferAvailabilityProtocol protocol = new CheckOfferAvailabilityProtocol(model);
checkOfferAvailabilityProtocolMap.put(offer.getId(), protocol);
protocol.onCheckOfferAvailability();
protocol.checkOfferAvailability();
}
else {
log.error("onGetOfferAvailableStateRequested already called for offer with ID:" + offer.getId());
log.error("That should never happen: onCheckOfferAvailability already called for offer with ID:" + offer.getId());
}
}
// When closing take offer view, we are not interested in the requestIsOfferAvailable result anymore, so remove from the map
public void onGetOfferAvailableStateRequestCanceled(Offer offer) {
cleanupCheckOfferAvailabilityProtocolMap(offer);
// When closing take offer view, we are not interested in the onCheckOfferAvailability result anymore, so remove from the map
public void cancelGetOfferAvailableStateRequest(Offer offer) {
disposeCheckOfferAvailabilityRequest(offer);
}
public void onPlaceOfferRequested(String id,
Direction direction,
Fiat price,
Coin amount,
Coin minAmount,
TransactionResultHandler resultHandler,
ErrorMessageHandler errorMessageHandler) {
public void placeOffer(String id,
Direction direction,
Fiat price,
Coin amount,
Coin minAmount,
TransactionResultHandler resultHandler,
ErrorMessageHandler errorMessageHandler) {
BankAccount currentBankAccount = user.getCurrentBankAccount().get();
Offer offer = new Offer(id,
@ -186,14 +183,14 @@ public class TradeManager {
(message, throwable) -> errorMessageHandler.handleErrorMessage(message)
);
placeOfferProtocol.onPlaceOfferRequested();
placeOfferProtocol.placeOffer();
}
public void onRemoveOpenOfferRequested(String offerId, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
public void removeOpenOffer(String offerId, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
removeOpenOffer(offerId, resultHandler, errorMessageHandler, true);
}
public Trade onTakeOfferRequested(Coin amount, Offer offer) {
public Trade takeOffer(Coin amount, Offer offer) {
Trade trade = createTrade(offer);
trade.setTradeAmount(amount);
@ -232,7 +229,7 @@ public class TradeManager {
SellerAsTakerProtocol sellerTakesOfferProtocol = new SellerAsTakerProtocol(model);
takerAsSellerProtocolMap.put(trade.getId(), sellerTakesOfferProtocol);
sellerTakesOfferProtocol.onTakeOfferRequested();
sellerTakesOfferProtocol.takeOffer();
return trade;
}
@ -250,7 +247,7 @@ public class TradeManager {
}
public void onCloseTradeRequested(Trade trade) {
public void closeTrade(Trade trade) {
closeTrade(trade, false);
}
@ -260,7 +257,7 @@ public class TradeManager {
///////////////////////////////////////////////////////////////////////////////////////////
public void onOfferRemovedFromRemoteOfferBook(Offer offer) {
cleanupCheckOfferAvailabilityProtocolMap(offer);
disposeCheckOfferAvailabilityRequest(offer);
}
@ -289,7 +286,7 @@ public class TradeManager {
}
}
///////////////////////////////////////////////////////////////////////////////////////////
// Private
///////////////////////////////////////////////////////////////////////////////////////////
@ -309,7 +306,7 @@ public class TradeManager {
() -> {
if (openOffers.containsKey(offerId)) {
OpenOffer openOffer = openOffers.remove(offerId);
cleanupCheckOfferAvailabilityProtocolMap(openOffer.getOffer());
disposeCheckOfferAvailabilityRequest(openOffer.getOffer());
persistOpenOffers();
if (removeFromOffererAsBuyerProtocolMap && offererAsBuyerProtocolMap.containsKey(offerId)) {
offererAsBuyerProtocolMap.get(offerId).cleanup();
@ -328,7 +325,7 @@ public class TradeManager {
private Trade createTrade(Offer offer) {
if (pendingTrades.containsKey(offer.getId()))
log.error("trades contains already an trade with the ID " + offer.getId());
log.error("That must never happen: Trades contains already an trade with the ID " + offer.getId());
Trade trade = new Trade(offer);
pendingTrades.put(offer.getId(), trade);
@ -349,7 +346,7 @@ public class TradeManager {
user);
openOffer.stateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("trade state = " + newValue);
log.debug("openOffer state = " + newValue);
switch (newValue) {
case OPEN:
break;
@ -390,7 +387,7 @@ public class TradeManager {
});
break;
default:
log.error("Unhandled trade state: " + newValue);
log.error("Unhandled openOffer state: " + newValue);
break;
}
});
@ -405,7 +402,7 @@ public class TradeManager {
private void closeTrade(Trade trade, boolean failed) {
if (!pendingTrades.containsKey(trade.getId()))
log.error("trades does not contain the trade with the ID " + trade.getId());
log.error("That must never happen: trades does not contain the trade with the ID " + trade.getId());
pendingTrades.remove(trade.getId());
persistPendingTrades();
@ -428,7 +425,7 @@ public class TradeManager {
}
}
private void cleanupCheckOfferAvailabilityProtocolMap(Offer offer) {
private void disposeCheckOfferAvailabilityRequest(Offer offer) {
if (checkOfferAvailabilityProtocolMap.containsKey(offer.getId())) {
CheckOfferAvailabilityProtocol protocol = checkOfferAvailabilityProtocolMap.get(offer.getId());
protocol.cancel();

4
gui/src/main/java/io/bitsquare/trade/TradeMessageModule.java
View File

@ -19,6 +19,8 @@ package io.bitsquare.trade;
import io.bitsquare.BitsquareModule;
import com.google.inject.Singleton;
import org.springframework.core.env.Environment;
public abstract class TradeMessageModule extends BitsquareModule {
@ -30,6 +32,8 @@ public abstract class TradeMessageModule extends BitsquareModule {
@Override
protected final void configure() {
doConfigure();
bind(TradeManager.class).in(Singleton.class);
}
protected void doConfigure() {

2
gui/src/main/java/io/bitsquare/trade/protocol/offer/CheckOfferAvailabilityProtocol.java
View File

@ -55,7 +55,7 @@ public class CheckOfferAvailabilityProtocol {
// Called from UI
///////////////////////////////////////////////////////////////////////////////////////////
public void onCheckOfferAvailability() {
public void checkOfferAvailability() {
model.getTradeMessageService().addMessageHandler(this::handleMessage);
sequence = new TaskRunner<>(model,

2
gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
View File

@ -55,7 +55,7 @@ public class PlaceOfferProtocol {
this.offerBookService = offerBookService;
}
public void onPlaceOfferRequested() {
public void placeOffer() {
try {
validateOffer();
Transaction transaction = createOfferFeeTx();

2
gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
View File

@ -66,7 +66,7 @@ public class SellerAsTakerProtocol {
// Called from UI
///////////////////////////////////////////////////////////////////////////////////////////
public void onTakeOfferRequested() {
public void takeOffer() {
model.getTradeMessageService().addMessageHandler(this::handleMessage);
SellerAsTakerTaskRunner<SellerAsTakerModel> sequence = new SellerAsTakerTaskRunner<>(model,

2
gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
View File

@ -277,7 +277,7 @@ public class PlaceOfferProtocolTest {
countDownLatch.countDown();
};
PlaceOfferProtocol placeOfferProtocol = getPlaceOfferProtocol(getOffer(), resultHandler, faultHandler);
placeOfferProtocol.onPlaceOfferRequested();
placeOfferProtocol.placeOffer();
countDownLatch.await();
}