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

Rename trade.getState to getTradeState

Browse source
This commit is contained in:
chimp1984 2021-10-20 23:59:29 +02:00
parent 5b0e9ab92f
commit 544dd895fc
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
14 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/api/model/TradeInfo.java
View file

@ -138,7 +138,7 @@ public class TradeInfo implements Payload {
.withTradeVolume(trade.getTradeVolume() == null ? 0 : trade.getTradeVolume().getValue())
.withTradingPeerNodeAddress(Objects.requireNonNull(
trade.getTradingPeerNodeAddress()).getHostNameWithoutPostFix())
.withState(trade.getState().name())
.withState(trade.getTradeState().name())
.withPhase(trade.getPhase().name())
.withTradePeriodState(trade.getTradePeriodState().name())
.withIsDepositPublished(trade.isDepositPublished())

2
core/src/main/java/bisq/core/support/traderchat/TradeChatSession.java
View file

@ -64,7 +64,7 @@ public class TradeChatSession extends SupportSession {
@Override
public boolean chatIsOpen() {
return trade != null && trade.getState() != Trade.State.WITHDRAW_COMPLETED;
return trade != null && trade.getTradeState() != Trade.State.WITHDRAW_COMPLETED;
}
@Override

2
core/src/main/java/bisq/core/trade/bisq_v1/ClosedTradeUtil.java
View file

@ -326,7 +326,7 @@ public class ClosedTradeUtil {
} else {
log.error("That must not happen. We got a pending state but we are in"
+ " the closed trades list. state={}",
trade.getState().name());
trade.getTradeState().name());
return Res.get("shared.na");
}
} else if (tradable instanceof OpenOffer) {

21
core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
View file

@ -324,7 +324,6 @@ public abstract class Trade implements Tradable, Model {
@Nullable
@Getter
private NodeAddress tradingPeerNodeAddress;
@Getter
private State state = State.PREPARATION;
@Getter
private DisputeState disputeState = DisputeState.NO_DISPUTE;
@ -823,6 +822,10 @@ public abstract class Trade implements Tradable, Model {
return new Date(takeOfferDate);
}
public State getTradeState() {
return state;
}
public Phase getPhase() {
return state.getTradePhase();
}
@ -895,15 +898,15 @@ public abstract class Trade implements Tradable, Model {
}
public boolean isInPreparation() {
return getState().getTradePhase().ordinal() == Phase.INIT.ordinal();
return getTradeState().getTradePhase().ordinal() == Phase.INIT.ordinal();
}
public boolean isTakerFeePublished() {
return getState().getTradePhase().ordinal() >= Phase.TAKER_FEE_PUBLISHED.ordinal();
return getTradeState().getTradePhase().ordinal() >= Phase.TAKER_FEE_PUBLISHED.ordinal();
}
public boolean isDepositPublished() {
return getState().getTradePhase().ordinal() >= Phase.DEPOSIT_PUBLISHED.ordinal();
return getTradeState().getTradePhase().ordinal() >= Phase.DEPOSIT_PUBLISHED.ordinal();
}
public boolean isFundsLockedIn() {
@ -937,23 +940,23 @@ public abstract class Trade implements Tradable, Model {
}
public boolean isDepositConfirmed() {
return getState().getTradePhase().ordinal() >= Phase.DEPOSIT_CONFIRMED.ordinal();
return getTradeState().getTradePhase().ordinal() >= Phase.DEPOSIT_CONFIRMED.ordinal();
}
public boolean isFiatSent() {
return getState().getTradePhase().ordinal() >= Phase.FIAT_SENT.ordinal();
return getTradeState().getTradePhase().ordinal() >= Phase.FIAT_SENT.ordinal();
}
public boolean isFiatReceived() {
return getState().getTradePhase().ordinal() >= Phase.FIAT_RECEIVED.ordinal();
return getTradeState().getTradePhase().ordinal() >= Phase.FIAT_RECEIVED.ordinal();
}
public boolean isPayoutPublished() {
return getState().getTradePhase().ordinal() >= Phase.PAYOUT_PUBLISHED.ordinal() || isWithdrawn();
return getTradeState().getTradePhase().ordinal() >= Phase.PAYOUT_PUBLISHED.ordinal() || isWithdrawn();
}
public boolean isWithdrawn() {
return getState().getTradePhase().ordinal() == Phase.WITHDRAWN.ordinal();
return getTradeState().getTradePhase().ordinal() == Phase.WITHDRAWN.ordinal();
}
public ReadOnlyObjectProperty<State> stateProperty() {

10
core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
View file

@ -280,7 +280,7 @@ public class FluentProtocol {
String info = MessageFormat.format("We received a {0} at phase {1} and state {2}, tradeId={3}",
trigger,
trade.getPhase(),
trade.getState(),
trade.getTradeState(),
trade.getId());
log.info(info);
return Result.VALID.info(info);
@ -292,7 +292,7 @@ public class FluentProtocol {
trigger,
expectedPhases,
trade.getPhase(),
trade.getState(),
trade.getTradeState(),
trade.getId());
return Result.INVALID_PHASE.info(info);
}
@ -303,7 +303,7 @@ public class FluentProtocol {
return Result.VALID;
}
boolean isStateValid = expectedStates.stream().anyMatch(e -> e == trade.getState());
boolean isStateValid = expectedStates.stream().anyMatch(e -> e == trade.getTradeState());
String trigger = message != null ?
message.getClass().getSimpleName() :
event != null ?
@ -312,7 +312,7 @@ public class FluentProtocol {
if (isStateValid) {
String info = MessageFormat.format("We received a {0} at state {1}, tradeId={2}",
trigger,
trade.getState(),
trade.getTradeState(),
trade.getId());
log.info(info);
return Result.VALID.info(info);
@ -321,7 +321,7 @@ public class FluentProtocol {
"Expected states={1}, Trade state= {2}, tradeId={3}",
trigger,
expectedStates,
trade.getState(),
trade.getTradeState(),
trade.getId());
return Result.INVALID_STATE.info(info);
}

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/SetupPayoutTxListener.java
View file

@ -95,7 +95,7 @@ public abstract class SetupPayoutTxListener extends TradeTask {
BtcWalletService.printTx("payoutTx received from network", walletTx);
setState();
} else {
log.info("We had the payout tx already set. tradeId={}, state={}", trade.getId(), trade.getState());
log.info("We had the payout tx already set. tradeId={}, state={}", trade.getId(), trade.getTradeState());
}
processModel.getBtcWalletService().resetCoinLockedInMultiSigAddressEntry(trade.getId());

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerProcessDepositTxAndDelayedPayoutTxMessage.java
View file

@ -105,7 +105,7 @@ public class BuyerProcessDepositTxAndDelayedPayoutTxMessage extends TradeTask {
}
// If we got already the confirmation we don't want to apply an earlier state
if (trade.getState().ordinal() < Trade.State.BUYER_SAW_DEPOSIT_TX_IN_NETWORK.ordinal()) {
if (trade.getTradeState().ordinal() < Trade.State.BUYER_SAW_DEPOSIT_TX_IN_NETWORK.ordinal()) {
trade.setState(Trade.State.BUYER_RECEIVED_DEPOSIT_TX_PUBLISHED_MSG);
}

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerSendCounterCurrencyTransferStartedMessage.java
View file

@ -83,7 +83,7 @@ public class BuyerSendCounterCurrencyTransferStartedMessage extends SendMailboxM
@Override
protected void setStateSent() {
if (trade.getState().ordinal() < Trade.State.BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG.ordinal()) {
if (trade.getTradeState().ordinal() < Trade.State.BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG.ordinal()) {
trade.setStateIfValidTransitionTo(Trade.State.BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG);
}

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/ProcessMediatedPayoutSignatureMessage.java
View file

@ -39,7 +39,7 @@ public class ProcessMediatedPayoutSignatureMessage extends TradeTask {
protected void run() {
try {
runInterceptHook();
log.debug("current trade state " + trade.getState());
log.debug("current trade state " + trade.getTradeState());
MediatedPayoutTxSignatureMessage message = (MediatedPayoutTxSignatureMessage) processModel.getTradeMessage();
Validator.checkTradeId(processModel.getOfferId(), message);
checkNotNull(message);

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java
View file

@ -39,7 +39,7 @@ public class SellerProcessCounterCurrencyTransferStartedMessage extends TradeTas
protected void run() {
try {
runInterceptHook();
log.debug("current trade state " + trade.getState());
log.debug("current trade state " + trade.getTradeState());
CounterCurrencyTransferStartedMessage message = (CounterCurrencyTransferStartedMessage) processModel.getTradeMessage();
Validator.checkTradeId(processModel.getOfferId(), message);
checkNotNull(message);

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_maker/SellerAsMakerProcessDepositTxMessage.java
View file

@ -38,7 +38,7 @@ public class SellerAsMakerProcessDepositTxMessage extends TradeTask {
protected void run() {
try {
runInterceptHook();
log.debug("current trade state " + trade.getState());
log.debug("current trade state " + trade.getTradeState());
DepositTxMessage message = (DepositTxMessage) processModel.getTradeMessage();
Validator.checkTradeId(processModel.getOfferId(), message);
checkNotNull(message);

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

@ -204,7 +204,7 @@ public class XmrTxProofService implements AssetTxProofService {
// Basic requirements are fulfilled.
// We process further if we are in the expected state or register a listener
private void processTradeOrAddListener(SellerTrade trade) {
if (isExpectedTradeState(trade.getState())) {
if (isExpectedTradeState(trade.getTradeState())) {
startRequestsIfValid(trade);
} else {
// We are expecting SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG in the future, so listen on changes

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

@ -420,7 +420,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
private void applyTradeErrorMessage(@Nullable String errorMessage) {
if (errorMessage != null) {
String appendMsg = "";
switch (trade.getState().getTradePhase()) {
switch (trade.getTradeState().getTradePhase()) {
case INIT:
appendMsg = Res.get("takeOffer.error.noFundsLost");
break;

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
View file

@ -324,7 +324,7 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
textArea.scrollTopProperty().addListener(changeListener);
textArea.setScrollTop(30);
addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("tradeDetailsWindow.tradeState"), trade.getState().getTradePhase().name());
addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("tradeDetailsWindow.tradeState"), trade.getTradeState().getTradePhase().name());
}
Tuple3<Button, Button, HBox> tuple = add2ButtonsWithBox(gridPane, ++rowIndex,