nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename trade getPayoutAmount() to getPayoutAmountBeforeCost()

Browse Source
This commit is contained in:
woodser 2023-12-09 06:21:59 -05:00
parent 7bfba15109
commit 948be8ce29
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/haveno/core/trade/ArbitratorTrade.java
View File

@ -31,7 +31,7 @@ public class ArbitratorTrade extends Trade {
}
@Override
public BigInteger getPayoutAmount() {
public BigInteger getPayoutAmountBeforeCost() {
throw new RuntimeException("Arbitrator does not have a payout amount");
}

2
core/src/main/java/haveno/core/trade/BuyerTrade.java
View File

@ -53,7 +53,7 @@ public abstract class BuyerTrade extends Trade {
}
@Override
public BigInteger getPayoutAmount() {
public BigInteger getPayoutAmountBeforeCost() {
checkNotNull(getAmount(), "Invalid state: getTradeAmount() = null");
return getAmount().add(getBuyerSecurityDepositBeforeMiningFee());
}

2
core/src/main/java/haveno/core/trade/SellerTrade.java
View File

@ -51,7 +51,7 @@ public abstract class SellerTrade extends Trade {
}
@Override
public BigInteger getPayoutAmount() {
public BigInteger getPayoutAmountBeforeCost() {
return getSellerSecurityDepositBeforeMiningFee();
}

2
core/src/main/java/haveno/core/trade/Trade.java
View File

@ -1200,7 +1200,7 @@ public abstract class Trade implements Tradable, Model {
// Abstract
///////////////////////////////////////////////////////////////////////////////////////////
public abstract BigInteger getPayoutAmount();
public abstract BigInteger getPayoutAmountBeforeCost();
public abstract boolean confirmPermitted();

4
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View File

@ -223,9 +223,9 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
return sellerState;
}
public String getPayoutAmount() {
public String getPayoutAmountBeforeCost() {
return dataModel.getTrade() != null
? HavenoUtils.formatXmr(dataModel.getTrade().getPayoutAmount(), true)
? HavenoUtils.formatXmr(dataModel.getTrade().getPayoutAmountBeforeCost(), true)
: "";
}