Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-06 22:29:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename openOfferManager.getOpenOffer(id)

Browse source
This commit is contained in:
woodser 2025-03-08 07:55:06 -05:00 • committed by woodser
parent bf97fbc7ea
commit b0e9627c10
13 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/haveno/core/api/CoreOffersService.java
View file

@ -159,7 +159,7 @@ public class CoreOffersService {
} }
OpenOffer getMyOffer(String id) { OpenOffer getMyOffer(String id) {
return openOfferManager.getOpenOfferById(id) return openOfferManager.getOpenOffer(id)
.filter(open -> open.getOffer().isMyOffer(keyRing)) .filter(open -> open.getOffer().isMyOffer(keyRing))
.orElseThrow(() -> .orElseThrow(() ->
new IllegalStateException(format("openoffer with id '%s' not found", id))); new IllegalStateException(format("openoffer with id '%s' not found", id)));

14
core/src/main/java/haveno/core/offer/OpenOfferManager.java
View file

@ -236,7 +236,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
public void onAdded(Offer offer) { public void onAdded(Offer offer) {
// cancel offer if reserved funds spent // cancel offer if reserved funds spent
Optional<OpenOffer> openOfferOptional = getOpenOfferById(offer.getId()); Optional<OpenOffer> openOfferOptional = getOpenOffer(offer.getId());
if (openOfferOptional.isPresent() && openOfferOptional.get().getState() != OpenOffer.State.RESERVED && offer.isReservedFundsSpent()) { if (openOfferOptional.isPresent() && openOfferOptional.get().getState() != OpenOffer.State.RESERVED && offer.isReservedFundsSpent()) {
log.warn("Canceling open offer because reserved funds have been spent, offerId={}, state={}", offer.getId(), openOfferOptional.get().getState()); log.warn("Canceling open offer because reserved funds have been spent, offerId={}, state={}", offer.getId(), openOfferOptional.get().getState());
cancelOpenOffer(openOfferOptional.get(), null, null); cancelOpenOffer(openOfferOptional.get(), null, null);
@ -573,7 +573,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
// Remove from offerbook // Remove from offerbook
public void removeOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { public void removeOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
Optional<OpenOffer> openOfferOptional = getOpenOfferById(offer.getId()); Optional<OpenOffer> openOfferOptional = getOpenOffer(offer.getId());
if (openOfferOptional.isPresent()) { if (openOfferOptional.isPresent()) {
cancelOpenOffer(openOfferOptional.get(), resultHandler, errorMessageHandler); cancelOpenOffer(openOfferOptional.get(), resultHandler, errorMessageHandler);
} else { } else {
@ -686,7 +686,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
OpenOffer.State originalState, OpenOffer.State originalState,
ResultHandler resultHandler, ResultHandler resultHandler,
ErrorMessageHandler errorMessageHandler) { ErrorMessageHandler errorMessageHandler) {
Optional<OpenOffer> openOfferOptional = getOpenOfferById(editedOffer.getId()); Optional<OpenOffer> openOfferOptional = getOpenOffer(editedOffer.getId());
if (openOfferOptional.isPresent()) { if (openOfferOptional.isPresent()) {
OpenOffer openOffer = openOfferOptional.get(); OpenOffer openOffer = openOfferOptional.get();
@ -750,7 +750,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
// close open offer after key images spent // close open offer after key images spent
public void closeOpenOffer(Offer offer) { public void closeOpenOffer(Offer offer) {
getOpenOfferById(offer.getId()).ifPresent(openOffer -> { getOpenOffer(offer.getId()).ifPresent(openOffer -> {
removeOpenOffer(openOffer); removeOpenOffer(openOffer);
openOffer.setState(OpenOffer.State.CLOSED); openOffer.setState(OpenOffer.State.CLOSED);
xmrWalletService.resetAddressEntriesForOpenOffer(offer.getId()); xmrWalletService.resetAddressEntriesForOpenOffer(offer.getId());
@ -813,14 +813,14 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
return openOffers.getObservableList(); return openOffers.getObservableList();
} }
public Optional<OpenOffer> getOpenOfferById(String offerId) { public Optional<OpenOffer> getOpenOffer(String offerId) {
synchronized (openOffers) { synchronized (openOffers) {
return openOffers.stream().filter(e -> e.getId().equals(offerId)).findFirst(); return openOffers.stream().filter(e -> e.getId().equals(offerId)).findFirst();
} }
} }
public boolean hasOpenOffer(String offerId) { public boolean hasOpenOffer(String offerId) {
return getOpenOfferById(offerId).isPresent(); return getOpenOffer(offerId).isPresent();
} }
public Optional<SignedOffer> getSignedOfferById(String offerId) { public Optional<SignedOffer> getSignedOfferById(String offerId) {
@ -1575,7 +1575,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
} }
try { try {
Optional<OpenOffer> openOfferOptional = getOpenOfferById(request.offerId); Optional<OpenOffer> openOfferOptional = getOpenOffer(request.offerId);
AvailabilityResult availabilityResult; AvailabilityResult availabilityResult;
byte[] makerSignature = null; byte[] makerSignature = null;
if (openOfferOptional.isPresent()) { if (openOfferOptional.isPresent()) {

2
core/src/main/java/haveno/core/support/dispute/mediation/MediationManager.java
View file

@ -196,7 +196,7 @@ public final class MediationManager extends DisputeManager<MediationDisputeList>
tradeManager.requestPersistence(); tradeManager.requestPersistence();
} }
} else { } else {
Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOfferById(tradeId); Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOffer(tradeId);
openOfferOptional.ifPresent(openOffer -> openOfferManager.closeOpenOffer(openOffer.getOffer())); openOfferOptional.ifPresent(openOffer -> openOfferManager.closeOpenOffer(openOffer.getOffer()));
} }
sendAckMessage(chatMessage, dispute.getAgentPubKeyRing(), true, null); sendAckMessage(chatMessage, dispute.getAgentPubKeyRing(), true, null);

4
core/src/main/java/haveno/core/support/dispute/refund/RefundManager.java
View file

@ -196,7 +196,7 @@ public final class RefundManager extends DisputeManager<RefundDisputeList> {
tradeManager.requestPersistence(); tradeManager.requestPersistence();
} }
} else { } else {
Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOfferById(tradeId); Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOffer(tradeId);
openOfferOptional.ifPresent(openOffer -> openOfferManager.closeOpenOffer(openOffer.getOffer())); openOfferOptional.ifPresent(openOffer -> openOfferManager.closeOpenOffer(openOffer.getOffer()));
} }
sendAckMessage(chatMessage, dispute.getAgentPubKeyRing(), true, null); sendAckMessage(chatMessage, dispute.getAgentPubKeyRing(), true, null);
@ -205,7 +205,7 @@ public final class RefundManager extends DisputeManager<RefundDisputeList> {
if (tradeManager.getOpenTrade(tradeId).isPresent()) { if (tradeManager.getOpenTrade(tradeId).isPresent()) {
tradeManager.closeDisputedTrade(tradeId, Trade.DisputeState.REFUND_REQUEST_CLOSED); tradeManager.closeDisputedTrade(tradeId, Trade.DisputeState.REFUND_REQUEST_CLOSED);
} else { } else {
Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOfferById(tradeId); Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOffer(tradeId);
openOfferOptional.ifPresent(openOffer -> openOfferManager.closeOpenOffer(openOffer.getOffer())); openOfferOptional.ifPresent(openOffer -> openOfferManager.closeOpenOffer(openOffer.getOffer()));
} }

4
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -1604,7 +1604,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
} }
// unreserve maker's open offer // unreserve maker's open offer
Optional<OpenOffer> openOffer = processModel.getOpenOfferManager().getOpenOfferById(this.getId()); Optional<OpenOffer> openOffer = processModel.getOpenOfferManager().getOpenOffer(this.getId());
if (this instanceof MakerTrade && openOffer.isPresent()) { if (this instanceof MakerTrade && openOffer.isPresent()) {
processModel.getOpenOfferManager().unreserveOpenOffer(openOffer.get()); processModel.getOpenOfferManager().unreserveOpenOffer(openOffer.get());
} }
@ -1688,7 +1688,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
private void restoreDepositsPublishedTrade() { private void restoreDepositsPublishedTrade() {
// close open offer // close open offer
if (this instanceof MakerTrade && processModel.getOpenOfferManager().getOpenOfferById(getId()).isPresent()) { if (this instanceof MakerTrade && processModel.getOpenOfferManager().getOpenOffer(getId()).isPresent()) {
log.info("Closing open offer because {} {} was restored after protocol error", getClass().getSimpleName(), getShortId()); log.info("Closing open offer because {} {} was restored after protocol error", getClass().getSimpleName(), getShortId());
processModel.getOpenOfferManager().closeOpenOffer(checkNotNull(getOffer())); processModel.getOpenOfferManager().closeOpenOffer(checkNotNull(getOffer()));
} }

2
core/src/main/java/haveno/core/trade/TradeManager.java
View file

@ -556,7 +556,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
if (request.getMakerNodeAddress().equals(p2PService.getNetworkNode().getNodeAddress())) { if (request.getMakerNodeAddress().equals(p2PService.getNetworkNode().getNodeAddress())) {
// get open offer // get open offer
Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOfferById(request.getOfferId()); Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOffer(request.getOfferId());
if (!openOfferOptional.isPresent()) return; if (!openOfferOptional.isPresent()) return;
OpenOffer openOffer = openOfferOptional.get(); OpenOffer openOffer = openOfferOptional.get();
if (openOffer.getState() != OpenOffer.State.AVAILABLE) return; if (openOffer.getState() != OpenOffer.State.AVAILABLE) return;

2
core/src/main/java/haveno/core/trade/protocol/tasks/MaybeSendSignContractRequest.java
View file

@ -87,7 +87,7 @@ public class MaybeSendSignContractRequest extends TradeTask {
Integer subaddressIndex = null; Integer subaddressIndex = null;
boolean reserveExactAmount = false; boolean reserveExactAmount = false;
if (trade instanceof MakerTrade) { if (trade instanceof MakerTrade) {
reserveExactAmount = processModel.getOpenOfferManager().getOpenOfferById(trade.getId()).get().isReserveExactAmount(); reserveExactAmount = processModel.getOpenOfferManager().getOpenOffer(trade.getId()).get().isReserveExactAmount();
if (reserveExactAmount) subaddressIndex = model.getXmrWalletService().getAddressEntry(trade.getId(), XmrAddressEntry.Context.OFFER_FUNDING).get().getSubaddressIndex(); if (reserveExactAmount) subaddressIndex = model.getXmrWalletService().getAddressEntry(trade.getId(), XmrAddressEntry.Context.OFFER_FUNDING).get().getSubaddressIndex();
} }

2
core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
View file

@ -1171,7 +1171,7 @@ public class XmrWalletService extends XmrWalletBase {
public Stream<XmrAddressEntry> getAddressEntriesForAvailableBalanceStream() { public Stream<XmrAddressEntry> getAddressEntriesForAvailableBalanceStream() {
Stream<XmrAddressEntry> available = getFundedAvailableAddressEntries().stream(); Stream<XmrAddressEntry> available = getFundedAvailableAddressEntries().stream();
available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.ARBITRATOR).stream()); available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.ARBITRATOR).stream());
available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.OFFER_FUNDING).stream().filter(entry -> !tradeManager.getOpenOfferManager().getOpenOfferById(entry.getOfferId()).isPresent())); available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.OFFER_FUNDING).stream().filter(entry -> !tradeManager.getOpenOfferManager().getOpenOffer(entry.getOfferId()).isPresent()));
available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.TRADE_PAYOUT).stream().filter(entry -> tradeManager.getTrade(entry.getOfferId()) == null || tradeManager.getTrade(entry.getOfferId()).isPayoutUnlocked())); available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.TRADE_PAYOUT).stream().filter(entry -> tradeManager.getTrade(entry.getOfferId()) == null || tradeManager.getTrade(entry.getOfferId()).isPayoutUnlocked()));
return available.filter(addressEntry -> getBalanceForSubaddress(addressEntry.getSubaddressIndex()).compareTo(BigInteger.ZERO) > 0); return available.filter(addressEntry -> getBalanceForSubaddress(addressEntry.getSubaddressIndex()).compareTo(BigInteger.ZERO) > 0);
} }

4
desktop/src/main/java/haveno/desktop/main/funds/locked/LockedView.java
View file

@ -225,8 +225,8 @@ public class LockedView extends ActivatableView<VBox, Void> {
Optional<Trade> tradeOptional = tradeManager.getOpenTrade(offerId); Optional<Trade> tradeOptional = tradeManager.getOpenTrade(offerId);
if (tradeOptional.isPresent()) { if (tradeOptional.isPresent()) {
return Optional.of(tradeOptional.get()); return Optional.of(tradeOptional.get());
} else if (openOfferManager.getOpenOfferById(offerId).isPresent()) { } else if (openOfferManager.getOpenOffer(offerId).isPresent()) {
return Optional.of(openOfferManager.getOpenOfferById(offerId).get()); return Optional.of(openOfferManager.getOpenOffer(offerId).get());
} else { } else {
return Optional.empty(); return Optional.empty();
} }

4
desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedView.java
View file

@ -224,8 +224,8 @@ public class ReservedView extends ActivatableView<VBox, Void> {
Optional<Trade> tradeOptional = tradeManager.getOpenTrade(offerId); Optional<Trade> tradeOptional = tradeManager.getOpenTrade(offerId);
if (tradeOptional.isPresent()) { if (tradeOptional.isPresent()) {
return Optional.of(tradeOptional.get()); return Optional.of(tradeOptional.get());
} else if (openOfferManager.getOpenOfferById(offerId).isPresent()) { } else if (openOfferManager.getOpenOffer(offerId).isPresent()) {
return Optional.of(openOfferManager.getOpenOfferById(offerId).get()); return Optional.of(openOfferManager.getOpenOffer(offerId).get());
} else { } else {
return Optional.<Tradable>empty(); return Optional.<Tradable>empty();
} }

2
desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java
View file

@ -665,7 +665,7 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
createOfferRequested = false; createOfferRequested = false;
createOfferCanceled = true; createOfferCanceled = true;
OpenOfferManager openOfferManager = HavenoUtils.openOfferManager; OpenOfferManager openOfferManager = HavenoUtils.openOfferManager;
Optional<OpenOffer> openOffer = openOfferManager.getOpenOfferById(offer.getId()); Optional<OpenOffer> openOffer = openOfferManager.getOpenOffer(offer.getId());
if (openOffer.isPresent()) { if (openOffer.isPresent()) {
openOfferManager.cancelOpenOffer(openOffer.get(), () -> { openOfferManager.cancelOpenOffer(openOffer.get(), () -> {
UserThread.execute(() -> { UserThread.execute(() -> {

2
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -711,6 +711,6 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
abstract String getCurrencyCodeFromPreferences(OfferDirection direction); abstract String getCurrencyCodeFromPreferences(OfferDirection direction);
public OpenOffer getOpenOffer(Offer offer) { public OpenOffer getOpenOffer(Offer offer) {
return openOfferManager.getOpenOfferById(offer.getId()).orElse(null); return openOfferManager.getOpenOffer(offer.getId()).orElse(null);
} }
} }

2
desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java
View file

@ -342,7 +342,7 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
BigInteger reservedAmount = isMyOffer ? offer.getReservedAmount() : null; BigInteger reservedAmount = isMyOffer ? offer.getReservedAmount() : null;
// get offer challenge // get offer challenge
OpenOffer myOpenOffer = HavenoUtils.openOfferManager.getOpenOfferById(offer.getId()).orElse(null); OpenOffer myOpenOffer = HavenoUtils.openOfferManager.getOpenOffer(offer.getId()).orElse(null);
String offerChallenge = myOpenOffer == null ? null : myOpenOffer.getChallenge(); String offerChallenge = myOpenOffer == null ? null : myOpenOffer.getChallenge();
rows = 3; rows = 3;