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

Jump to bottom

Fix issues with missing persistence for trade state #4816

Merged
merged 10 commits into from Nov 19, 2020
Merged

Fix issues with missing persistence for trade state #4816

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6fc36d4
Reduce interval for persistence
chimp1984 Nov 18, 2020
fa0c28a
Add requestPersistence calls
chimp1984 Nov 18, 2020
9517f42
Refactoring: Extract requestPersistence method
chimp1984 Nov 18, 2020
255460e
Add more requestPersistence for data changes in ProcessModel and Trad…
chimp1984 Nov 18, 2020
6fb36dc
Add more requestPersistence calls
chimp1984 Nov 18, 2020
438a0d8
Remove requestPersistence in constructor as TradeManager is not set a…
chimp1984 Nov 19, 2020
706ec5a
Add null checks for tradeManager
chimp1984 Nov 19, 2020
da9b42f
Handle potential deposit confirmed state issues
chimp1984 Nov 19, 2020
d6f4eed
Add requestPersistence call at TradeTask.complete call.
chimp1984 Nov 19, 2020
a4db09f
Move delay for applying mailbox messages inside onInitialized
chimp1984 Nov 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions core/src/main/java/bisq/core/trade/closed/ClosedTradableManager.java
View file
Open in desktop
Expand Up @@ -84,13 +84,13 @@ public void onAllServicesInitialized() {

public void add(Tradable tradable) {
if (closedTradables.add(tradable)) {
persistenceManager.requestPersistence();
requestPersistence();
}
}

public void remove(Tradable tradable) {
if (closedTradables.remove(tradable)) {
persistenceManager.requestPersistence();
requestPersistence();
}
}

Expand All @@ -117,4 +117,8 @@ public Stream<Trade> getTradesStreamWithFundsLockedIn() {
return getClosedTrades().stream()
.filter(Trade::isFundsLockedIn);
}

private void requestPersistence() {
persistenceManager.requestPersistence();
}
}
10 changes: 7 additions & 3 deletions core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java
View file
Open in desktop
Expand Up @@ -95,13 +95,13 @@ public void onAllServicesInitialized() {

public void add(Trade trade) {
if (failedTrades.add(trade)) {
persistenceManager.requestPersistence();
requestPersistence();
}
}

public void removeTrade(Trade trade) {
if (failedTrades.remove(trade)) {
persistenceManager.requestPersistence();
requestPersistence();
}
}

Expand Down Expand Up @@ -129,7 +129,7 @@ public void unFailTrade(Trade trade) {
if (unFailTradeCallback.apply(trade)) {
log.info("Unfailing trade {}", trade.getId());
if (failedTrades.remove(trade)) {
persistenceManager.requestPersistence();
requestPersistence();
}
}
}
Expand All @@ -151,4 +151,8 @@ public String checkUnFail(Trade trade) {
}
return blockingTrades.toString();
}

private void requestPersistence() {
persistenceManager.requestPersistence();
}
}
8 changes: 6 additions & 2 deletions p2p/src/main/java/bisq/network/p2p/P2PService.java
View file
Open in desktop
Expand Up @@ -536,7 +536,7 @@ private void processMailboxItem(MailboxItem mailboxItem) {
mailboxItemsByUid.putIfAbsent(uid, new ArrayList<>());
mailboxItemsByUid.get(uid).add(mailboxItem);
mailboxMessageList.add(mailboxItem);
persistenceManager.requestPersistence();
requestPersistence();

NodeAddress sender = mailboxMessage.getSenderNodeAddress();
log.info("Received a {} mailbox message with uid {} and senderAddress {}",
Expand Down Expand Up @@ -818,7 +818,7 @@ public void removeMailboxMsg(DecryptedMessageWithPubKey decryptedMessageWithPubK
mailboxMessageList.remove(mailboxItem);
});
mailboxItemsByUid.remove(uid);
persistenceManager.requestPersistence();
requestPersistence();
}
});
} else {
Expand All @@ -827,6 +827,10 @@ public void removeMailboxMsg(DecryptedMessageWithPubKey decryptedMessageWithPubK
}
}

private void requestPersistence() {
persistenceManager.requestPersistence();
}


///////////////////////////////////////////////////////////////////////////////////////////
// Data storage
Expand Down