Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove unnecessary null check, use correct marker class, add mis… #7348

Merged
merged 3 commits into from
Jan 15, 2025
Merged

fix: remove unnecessary null check, use correct marker class, add mis… #7348

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae21be2
fix: remove unnecessary null check, use correct marker class, add mis…
thecockatiel Jan 4, 2025
6af0caf
fix: add curly braces and else
thecockatiel Jan 4, 2025
a9b0170
fix: Preferences.setRpcUser if statement
thecockatiel Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...n/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public CheckNumberOfUnconfirmedTransactions(TaskRunner<PlaceOfferModel> taskHand
@Override
protected void run() {
if (model.getWalletService().isUnconfirmedTransactionsLimitHit() || model.getBsqWalletService().isUnconfirmedTransactionsLimitHit())
failed(Res.get("shared.unconfirmedTransactionsLimitReached"));
return failed(Res.get("shared.unconfirmedTransactionsLimitReached"));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The curly brackets at the if are missing. The failed() method has void as return type so it cannot be used as return statement.

complete();
}
}
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ private long getTradeStartTime() {
long now = System.currentTimeMillis();
long startTime;
Transaction depositTx = getDepositTx();
if (depositTx != null && getDate() != null) {
if (depositTx != null) {
if (depositTx.getConfidence().getDepthInBlocks() > 0) {
final long tradeTime = getDate().getTime();
// Use tx.getIncludedInBestChainAt() when available, otherwise use tx.getUpdateTime()
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapBuyerAsMakerTrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package bisq.core.trade.model.bsq_swap;

import bisq.core.offer.Offer;
import bisq.core.trade.model.TakerTrade;
import bisq.core.trade.model.MakerTrade;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.protocol.bsq_swap.model.BsqSwapProtocolModel;

Expand All @@ -35,7 +35,7 @@
import javax.annotation.Nullable;

@Slf4j
public final class BsqSwapBuyerAsMakerTrade extends BsqSwapBuyerTrade implements TakerTrade {
public final class BsqSwapBuyerAsMakerTrade extends BsqSwapBuyerTrade implements MakerTrade {
public BsqSwapBuyerAsMakerTrade(Offer offer,
Coin amount,
long takeOfferDate,
Expand Down
Loading