mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add extra checks to avoid duplicated offers (#1246)

Browse source
This commit is contained in:
Manfred Karrer 2018-01-21 09:25:31 -05:00
parent e84cf66f47
commit c4c4c0662b
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java
View file

@ -54,10 +54,19 @@ public class OfferBook {
@Override
public void onAdded(Offer offer) {
OfferBookListItem offerBookListItem = new OfferBookListItem(offer);
if (!isOfferWithIdInList(offer)) {
offerBookListItems.add(offerBookListItem);
Log.logIfStressTests("OfferPayload added: No. of offers = " + offerBookListItems.size());
// We don't use the contains method as the equals method in Offer takes state and errorMessage into account.
// If we have an offer with same ID we remove it and add the new offer as it might have a changed state.
Optional<OfferBookListItem> candidateToRemove = offerBookListItems.stream()
.filter(item -> item.getOffer().getId().equals(offer.getId()))
.findAny();
if (candidateToRemove.isPresent()) {
log.info("We had an old offer in the list with the same Offer ID. Might be that the state or errorMessage was different. " +
"old offerBookListItem={}, new offerBookListItem={}", candidateToRemove.get(), offerBookListItem);
offerBookListItems.remove(candidateToRemove.get());
}
offerBookListItems.add(offerBookListItem);
Log.logIfStressTests("OfferPayload added: No. of offers = " + offerBookListItems.size());
}
@Override
@ -65,17 +74,15 @@ public class OfferBook {
// Update state in case that that offer is used in the take offer screen, so it gets updated correctly
offer.setState(Offer.State.REMOVED);
// clean up possible references in openOfferManager
// clean up possible references in openOfferManager
tradeManager.onOfferRemovedFromRemoteOfferBook(offer);
Optional<OfferBookListItem> candidate = offerBookListItems.stream()
// We don't use the contains method as the equals method in Offer takes state and errorMessage into account.
Optional<OfferBookListItem> candidateToRemove = offerBookListItems.stream()
.filter(item -> item.getOffer().getId().equals(offer.getId()))
.findAny();
if (candidate.isPresent()) {
OfferBookListItem item = candidate.get();
if (offerBookListItems.contains(item)) {
offerBookListItems.remove(item);
Log.logIfStressTests("OfferPayload removed: No. of offers = " + offerBookListItems.size());
}
if (candidateToRemove.isPresent()) {
offerBookListItems.remove(candidateToRemove.get());
Log.logIfStressTests("OfferPayload removed: No. of offers = " + offerBookListItems.size());
}
}
});
@ -91,8 +98,6 @@ public class OfferBook {
}
public void fillOfferBookListItems() {
log.debug("fillOfferBookListItems");
try {
// setAll causes sometimes an UnsupportedOperationException
// Investigate why....