From 612ecd3a6a7bb9dc4b6fb133a4917bdcde2fb44b Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Fri, 25 Sep 2020 21:32:27 -0500 Subject: [PATCH] Rename onFiatPaymentReceived to onPaymentReceived --- .../java/bisq/core/trade/SellerTrade.java | 4 ++-- .../java/bisq/core/trade/TradeManager.java | 20 ++++++++++++++----- .../trade/protocol/SellerAsMakerProtocol.java | 4 ++-- .../trade/protocol/SellerAsTakerProtocol.java | 4 ++-- .../core/trade/protocol/SellerProtocol.java | 2 +- .../trade/txproof/xmr/XmrTxProofService.java | 2 +- .../pendingtrades/PendingTradesDataModel.java | 2 +- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/bisq/core/trade/SellerTrade.java b/core/src/main/java/bisq/core/trade/SellerTrade.java index 68eed3a1e0..068695c730 100644 --- a/core/src/main/java/bisq/core/trade/SellerTrade.java +++ b/core/src/main/java/bisq/core/trade/SellerTrade.java @@ -83,9 +83,9 @@ public abstract class SellerTrade extends Trade { btcWalletService); } - public void onFiatPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + public void onPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { checkArgument(tradeProtocol instanceof SellerProtocol, "tradeProtocol NOT instanceof SellerProtocol"); - ((SellerProtocol) tradeProtocol).onFiatPaymentReceived(resultHandler, errorMessageHandler); + ((SellerProtocol) tradeProtocol).onPaymentReceived(resultHandler, errorMessageHandler); } @Override diff --git a/core/src/main/java/bisq/core/trade/TradeManager.java b/core/src/main/java/bisq/core/trade/TradeManager.java index 70ee264222..317cfc7a98 100644 --- a/core/src/main/java/bisq/core/trade/TradeManager.java +++ b/core/src/main/java/bisq/core/trade/TradeManager.java @@ -232,6 +232,11 @@ public class TradeManager implements PersistedDataHost { failedTradesManager.setUnfailTradeCallback(this::unfailTrade); } + + /////////////////////////////////////////////////////////////////////////////////////////// + // PersistedDataHost + /////////////////////////////////////////////////////////////////////////////////////////// + @Override public void readPersisted() { tradableList = new TradableList<>(tradableListStorage, "PendingTrades"); @@ -247,7 +252,7 @@ public class TradeManager implements PersistedDataHost { /////////////////////////////////////////////////////////////////////////////////////////// - // Lifecycle + // API /////////////////////////////////////////////////////////////////////////////////////////// public void onAllServicesInitialized() { @@ -278,6 +283,11 @@ public class TradeManager implements PersistedDataHost { // Do nothing here } + + /////////////////////////////////////////////////////////////////////////////////////////// + // Private + /////////////////////////////////////////////////////////////////////////////////////////// + private void initPendingTrades() { tradableList.forEach(this::initPendingTrade); pendingTradesInitialized.set(true); @@ -290,10 +300,10 @@ public class TradeManager implements PersistedDataHost { trade.updateDepositTxFromWallet(); } - public void onUserConfirmedFiatPaymentReceived(SellerTrade sellerTrade, - ResultHandler resultHandler, - ErrorMessageHandler errorMessageHandler) { - sellerTrade.onFiatPaymentReceived(resultHandler, errorMessageHandler); + public void onPaymentReceived(SellerTrade sellerTrade, + ResultHandler resultHandler, + ErrorMessageHandler errorMessageHandler) { + sellerTrade.onPaymentReceived(resultHandler, errorMessageHandler); } private void onTradesChanged() { diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java index 7e38c4db29..b2c7ea7415 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java @@ -132,8 +132,8 @@ public class SellerAsMakerProtocol extends SellerProtocol implements MakerProtoc // We keep the handler here in as well to make it more transparent which messages we expect @Override - public void onFiatPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { - super.onFiatPaymentReceived(resultHandler, errorMessageHandler); + public void onPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + super.onPaymentReceived(resultHandler, errorMessageHandler); } diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java index 3f7f0d9bed..5ac1ae2562 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java @@ -129,8 +129,8 @@ public class SellerAsTakerProtocol extends SellerProtocol implements TakerProtoc // We keep the handler here in as well to make it more transparent which messages we expect @Override - public void onFiatPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { - super.onFiatPaymentReceived(resultHandler, errorMessageHandler); + public void onPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + super.onPaymentReceived(resultHandler, errorMessageHandler); } diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java index e2014b548b..af9c5690a0 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java @@ -119,7 +119,7 @@ public abstract class SellerProtocol extends MediationProtocol { // User interaction /////////////////////////////////////////////////////////////////////////////////////////// - public void onFiatPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + public void onPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { SellerEvent event = SellerEvent.PAYMENT_RECEIVED; expect(phase(Trade.Phase.FIAT_SENT) .with(event) diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java b/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java index 5c83364cab..51e85bca50 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java +++ b/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java @@ -263,7 +263,7 @@ public class XmrTxProofService implements AssetTxProofService { log.info("We auto-confirm trade {} as our all our services for the tx proof completed successfully", trade.getShortId()); log.info("###########################################################################################"); - trade.onFiatPaymentReceived(() -> { + trade.onPaymentReceived(() -> { }, errorMessage -> { }); } diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java index ee6343ef0b..08aabd9481 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java @@ -192,7 +192,7 @@ public class PendingTradesDataModel extends ActivatableDataModel { public void onFiatPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { checkNotNull(getTrade(), "trade must not be null"); checkArgument(getTrade() instanceof SellerTrade, "Trade must be instance of SellerTrade"); - tradeManager.onUserConfirmedFiatPaymentReceived((SellerTrade) getTrade(), resultHandler, errorMessageHandler); + tradeManager.onPaymentReceived((SellerTrade) getTrade(), resultHandler, errorMessageHandler); } public void onWithdrawRequest(String toAddress,