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

Refactor 2 predicates as single predicate

Browse source 
Resolves https://github.com/bisq-network/bisq/pull/5659#discussion_r689631147
This commit is contained in:
ghubstan 2021-08-16 14:17:28 -03:00
parent 6a4aceda7b
commit d709338d63
No known key found for this signature in database
GPG key ID: E35592D6800A861E
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java
View file

@ -247,8 +247,7 @@ public class OfferBook {
// Investigate why....
offerBookListItems.clear();
offerBookListItems.addAll(offerBookService.getOffers().stream()
.filter(o -> !isOfferIdBanned(o))
.filter(o -> isV3NodeAddressCompliant(o))
.filter(o -> isOfferAllowed(o))
.map(OfferBookListItem::new)
.collect(Collectors.toList()));
@ -288,21 +287,16 @@ public class OfferBook {
.findFirst();
}
private boolean isOfferIdBanned(Offer offer) {
return filterManager.isOfferIdBanned(offer.getId());
}
private boolean isV3NodeAddressCompliant(Offer offer) {
return !OfferRestrictions.requiresNodeAddressUpdate()
private boolean isOfferAllowed(Offer offer) {
boolean isBanned = filterManager.isOfferIdBanned(offer.getId());
boolean isV3NodeAddressCompliant = !OfferRestrictions.requiresNodeAddressUpdate()
|| Utils.isV3Address(offer.getMakerNodeAddress().getHostName());
return !isBanned && isV3NodeAddressCompliant;
}
private boolean isStoredLocally(Offer offer) {
return offerBookService.getOffers().stream()
.anyMatch(o -> o.getId().equals(offer.getId())
&& !isOfferIdBanned(o)
&& isV3NodeAddressCompliant(o)
);
.anyMatch(o -> o.getId().equals(offer.getId()) && isOfferAllowed(o));
}
private void fillOfferCountMaps() {