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

Cleanups

Browse source
This commit is contained in:
chimp1984 2021-10-20 12:20:53 +02:00
parent ed13d7207b
commit 7d48cdb941
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
10 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/offer/OfferUtil.java
View file

@ -484,7 +484,7 @@ public class OfferUtil {
}
} else {
errorMsg = "The maker fee tx is invalid as it does not has at least 2 outputs." + extraString +
"\nMakerFeeTx=" + makerFeeTx.toString();
"\nMakerFeeTx=" + makerFeeTx;
}
if (errorMsg == null) {

9
core/src/main/java/bisq/core/offer/OpenOffer.java
View file

@ -131,9 +131,8 @@ public final class OpenOffer implements Tradable {
proto.getTriggerPrice());
}
///////////////////////////////////////////////////////////////////////////////////////////
// Getters
// Tradable
///////////////////////////////////////////////////////////////////////////////////////////
@Override
@ -151,6 +150,11 @@ public final class OpenOffer implements Tradable {
return offer.getShortId();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Misc
///////////////////////////////////////////////////////////////////////////////////////////
public void setState(State state) {
this.state = state;
@ -185,7 +189,6 @@ public final class OpenOffer implements Tradable {
}
}
@Override
public String toString() {
return "OpenOffer{" +

16
core/src/main/java/bisq/core/offer/OpenOfferManager.java
View file

@ -88,19 +88,15 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
@Slf4j
public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMessageListener, PersistedDataHost {
private static final Logger log = LoggerFactory.getLogger(OpenOfferManager.class);
private static final long RETRY_REPUBLISH_DELAY_SEC = 10;
private static final long REPUBLISH_AGAIN_AT_STARTUP_DELAY_SEC = 30;
@ -546,7 +542,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
}
}
private void onRemoved(@NotNull OpenOffer openOffer, ResultHandler resultHandler, Offer offer) {
private void onRemoved(OpenOffer openOffer, ResultHandler resultHandler, Offer offer) {
offer.setState(Offer.State.REMOVED);
openOffer.setState(OpenOffer.State.CANCELED);
openOffers.remove(openOffer);
@ -926,10 +922,6 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
// messages in one go or to spread it over a delay. With power users who have 100-200 offers that can have
// some significant impact to user experience and the network
republishOffer(openOffer, () -> processListForRepublishOffers(list));
/* republishOffer(openOffer,
() -> UserThread.runAfter(() -> processListForRepublishOffers(list),
30, TimeUnit.MILLISECONDS));*/
} else {
// If the offer was removed in the meantime or if its deactivated we skip and call
// processListForRepublishOffers again with the list where we removed the offer already.
@ -1032,7 +1024,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
startPeriodicRepublishOffersTimer();
}
private void requestPersistence() {
public void requestPersistence() {
persistenceManager.requestPersistence();
}

2
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java
View file

@ -353,7 +353,7 @@ public abstract class MutableOfferDataModel extends OfferDataModel implements Bs
}
// Get average historic prices over for the prior trade period equaling the lock time
var blocksRange = Restrictions.getLockTime(paymentAccount.getPaymentMethod().isAsset());
var startDate = new Date(System.currentTimeMillis() - blocksRange * 10 * 60000);
var startDate = new Date(System.currentTimeMillis() - blocksRange * 10L * 60000);
var sortedRangeData = tradeStatisticsManager.getObservableTradeStatisticsSet().stream()
.filter(e -> e.getCurrency().equals(getTradeCurrency().getCode()))
.filter(e -> e.getDate().compareTo(startDate) >= 0)

2
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
View file

@ -171,7 +171,7 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel<?>> exten
protected int gridRow = 0;
private final List<Node> editOfferElements = new ArrayList<>();
private HashMap<String, Boolean> paymentAccountWarningDisplayed = new HashMap<>();
private final HashMap<String, Boolean> paymentAccountWarningDisplayed = new HashMap<>();
private boolean clearXchangeWarningDisplayed, fasterPaymentsWarningDisplayed, isActivated;
private InfoInputTextField marketBasedPriceInfoInputTextField, volumeInfoInputTextField,
buyerSecurityDepositInfoInputTextField, triggerPriceInfoInputTextField;

4
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/OfferViewUtil.java
View file

@ -21,9 +21,7 @@ import javafx.scene.control.Label;
import javafx.geometry.Insets;
/**
* Reusable methods for CreateOfferView, TakeOfferView or other related views
*/
// Shared utils for Views
public class OfferViewUtil {
public static Label createPopOverLabel(String text) {
final Label label = new Label(text);

1
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java
View file

@ -590,7 +590,6 @@ class TakeOfferDataModel extends OfferDataModel {
}
boolean wouldCreateDustForMaker() {
//noinspection SimplifiableIfStatement
boolean result;
if (amount.get() != null && offer != null) {
Coin customAmount = offer.getAmount().subtract(amount.get());

2
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
View file

@ -163,7 +163,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
isOfferAvailableSubscription;
private int gridRow = 0;
private HashMap<String, Boolean> paymentAccountWarningDisplayed = new HashMap<>();
private final HashMap<String, Boolean> paymentAccountWarningDisplayed = new HashMap<>();
private boolean offerDetailsWindowDisplayed, clearXchangeWarningDisplayed, fasterPaymentsWarningDisplayed,
takeOfferFromUnsignedAccountWarningDisplayed, cashByMailWarningDisplayed;
private SimpleBooleanProperty errorPopupDisplayed;

12
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java
View file

@ -264,8 +264,8 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
return true;
} else {
new Popup().warning(Res.get("shared.notEnoughFunds",
btcFormatter.formatCoinWithCode(dataModel.getTotalToPayAsCoin().get()),
btcFormatter.formatCoinWithCode(dataModel.getTotalAvailableBalance())))
btcFormatter.formatCoinWithCode(dataModel.getTotalToPayAsCoin().get()),
btcFormatter.formatCoinWithCode(dataModel.getTotalAvailableBalance())))
.actionButtonTextWithGoTo("navigation.funds.depositFunds")
.onAction(() -> navigation.navigateTo(MainView.class, FundsView.class, DepositView.class))
.show();
@ -350,14 +350,14 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
} else if (btcValidator.getMaxTradeLimit() != null && btcValidator.getMaxTradeLimit().value == OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value) {
if (dataModel.getDirection() == OfferPayload.Direction.BUY) {
new Popup().information(Res.get("popup.warning.tradeLimitDueAccountAgeRestriction.seller",
btcFormatter.formatCoinWithCode(OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT),
Res.get("offerbook.warning.newVersionAnnouncement")))
btcFormatter.formatCoinWithCode(OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT),
Res.get("offerbook.warning.newVersionAnnouncement")))
.width(900)
.show();
} else {
new Popup().information(Res.get("popup.warning.tradeLimitDueAccountAgeRestriction.buyer",
btcFormatter.formatCoinWithCode(OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT),
Res.get("offerbook.warning.newVersionAnnouncement")))
btcFormatter.formatCoinWithCode(OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT),
Res.get("offerbook.warning.newVersionAnnouncement")))
.width(900)
.show();
}

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

@ -57,6 +57,7 @@ public class OfferBook {
private final Map<String, Integer> sellOfferCountMap = new HashMap<>();
private final FilterManager filterManager;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
@ -201,7 +202,7 @@ public class OfferBook {
// Investigate why....
offerBookListItems.clear();
offerBookListItems.addAll(offerBookService.getOffers().stream()
.filter(o -> isOfferAllowed(o))
.filter(this::isOfferAllowed)
.map(OfferBookListItem::new)
.collect(Collectors.toList()));