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

remove unused protobuf fields

Browse source 
remove TraderSignedWitnessMessage
remove tx fee from offer and trade
set dispute's disputePayoutTxId when payout observed
synchronize access to PersistenceManager.persistNow()
fix concurrent modification exception in OfferBookChartView
This commit is contained in:
woodser 2023-02-10 11:01:41 -05:00
parent 0372af663a
commit 6f16a5ee92
30 changed files with 63 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cli/src/main/java/bisq/cli/table/builder/AbstractTradeListBuilder.java
View file

@ -63,8 +63,6 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder {
@Nullable
protected final Column<String> colMixedAmount;
@Nullable
protected final Column<Long> colMinerTxFee;
@Nullable
protected final MixedTradeFeeColumn colMixedTradeFee;
@Nullable
protected final Column<Long> colBuyerDeposit;
@ -115,7 +113,6 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder {
this.colCurrency = colSupplier.currencyColumn.get();
this.colAmount = colSupplier.amountColumn.get();
this.colMixedAmount = colSupplier.mixedAmountColumn.get();
this.colMinerTxFee = colSupplier.minerTxFeeColumn.get();
this.colMixedTradeFee = colSupplier.mixedTradeFeeColumn.get();
this.colBuyerDeposit = colSupplier.toSecurityDepositColumn.apply(COL_HEADER_BUYER_DEPOSIT);
this.colSellerDeposit = colSupplier.toSecurityDepositColumn.apply(COL_HEADER_SELLER_DEPOSIT);
@ -194,12 +191,6 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder {
? format("%.2f%s", t.getOffer().getMarketPriceMarginPct(), "%")
: "N/A";
protected final Function<TradeInfo, Long> toMyMinerTxFee = (t) -> {
return isTaker.test(t)
? t.getTxFeeAsLong()
: t.getOffer().getTxFee();
};
protected final Function<TradeInfo, Long> toTradeFeeBtc = (t) -> {
var isMyOffer = t.getOffer().getIsMyOffer();
if (isMyOffer) {

2
cli/src/main/java/bisq/cli/table/builder/ClosedTradeTableBuilder.java
View file

@ -43,7 +43,6 @@ class ClosedTradeTableBuilder extends AbstractTradeListBuilder {
colAmount.asStringColumn(),
colMixedAmount.justify(),
colCurrency,
colMinerTxFee.asStringColumn(),
colMixedTradeFee.asStringColumn(),
colBuyerDeposit.asStringColumn(),
colSellerDeposit.asStringColumn(),
@ -61,7 +60,6 @@ class ClosedTradeTableBuilder extends AbstractTradeListBuilder {
colAmount.addRow(t.getAmountAsLong());
colMixedAmount.addRow(t.getTradeVolume());
colCurrency.addRow(toPaymentCurrencyCode.apply(t));
colMinerTxFee.addRow(toMyMinerTxFee.apply(t));
colMixedTradeFee.addRow(toTradeFeeBtc.apply(t), false);

2
cli/src/main/java/bisq/cli/table/builder/TradeDetailTableBuilder.java
View file

@ -63,7 +63,6 @@ class TradeDetailTableBuilder extends AbstractTradeListBuilder {
colRole.addRow(trade.getRole());
colPrice.addRow(trade.getPrice());
colAmount.addRow(toTradeAmount.apply(trade));
colMinerTxFee.addRow(toMyMinerTxFee.apply(trade));
colBisqTradeFee.addRow(toMyMakerOrTakerFee.apply(trade));
colIsDepositPublished.addRow(trade.getIsDepositsPublished());
colIsDepositConfirmed.addRow(trade.getIsDepositsUnlocked());
@ -86,7 +85,6 @@ class TradeDetailTableBuilder extends AbstractTradeListBuilder {
add(colRole);
add(colPrice.justify());
add(colAmount.asStringColumn());
add(colMinerTxFee.asStringColumn());
add(colBisqTradeFee.asStringColumn());
add(colIsDepositPublished.asStringColumn());
add(colIsDepositConfirmed.asStringColumn());