mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename onFiatPaymentReceived to onPaymentReceived

Browse source
This commit is contained in:
chimp1984 2020-09-25 21:32:27 -05:00
parent 3cc633f39f
commit 612ecd3a6a
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
7 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/bisq/core/trade/SellerTrade.java
View file

@ -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

16
core/src/main/java/bisq/core/trade/TradeManager.java
View file

@ -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,
public void onPaymentReceived(SellerTrade sellerTrade,
ResultHandler resultHandler,
ErrorMessageHandler errorMessageHandler) {
sellerTrade.onFiatPaymentReceived(resultHandler, errorMessageHandler);
sellerTrade.onPaymentReceived(resultHandler, errorMessageHandler);
}
private void onTradesChanged() {

4
core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java
View file

@ -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);
}

4
core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java
View file

@ -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);
}

2
core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java
View file

@ -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)

2
core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
View file

@ -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 -> {
});
}

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file

@ -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,