BSQ swaps: Low risk refactorings [2] #5770
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…core.offer.placeoffer.bisq_v1
BuyerAsMakerTrade, BuyerAsTakerTrade, BuyerTrade to bisq.core.trade.model.bisq_v1 package
Move TradeMessage into bisq.core.trade.protocol package
…ore.trade.bisq_v1
…radeUtil, TradeTxException to package bisq.core.trade.bisq_v1
Move TradeMessage into bisq.core.trade.protocol package
…ore.trade.bisq_v1
…radeUtil, TradeTxException to package bisq.core.trade.bisq_v1
# Conflicts: # core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java # core/src/main/java/bisq/core/api/CoreOffersService.java # core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java # core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java # core/src/main/java/bisq/core/offer/OpenOfferManager.java # core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java # core/src/main/java/bisq/core/offer/bisq_v1/OfferPayload.java # core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java # core/src/main/java/bisq/core/offer/bisq_v1/TriggerPriceService.java # core/src/main/java/bisq/core/proto/ProtoDevUtil.java # core/src/main/java/bisq/core/trade/TradeManager.java # core/src/main/java/bisq/core/trade/bisq_v1/TradeResultHandler.java # core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java # core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java # core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java # core/src/main/java/bisq/core/trade/protocol/Provider.java # core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java # core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java # core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java # core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java # core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java # core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java # desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java # desktop/src/main/java/bisq/desktop/main/PriceUtil.java # desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java # desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java # desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java # desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java # desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java # desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java # desktop/src/main/java/bisq/desktop/main/offer/OfferView.java # desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java # desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java # desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java # desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java # desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java # desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java # desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java # desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java # desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java # desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java # desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java # desktop/src/main/java/bisq/desktop/util/DisplayUtils.java # desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java # desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferViewModelTest.java # desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java # desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java # desktop/src/test/java/bisq/desktop/maker/OfferMaker.java # monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java
chimp1984
force-pushed
the
bsq-swap-low-risk-refactorings
branch
from
cff719b to
fd28c63
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on #5769
Starts at: e752965
Contains low risk but potential functional changes as preparation for BSQ swap PR.
Contains preparations for BsqSwap which might not make sense at the moment of the commit (e.g. unused mehtods, params,...) but are done to reduce change set while getting closer to the full version.
EDIT:
Merged #5769 (which was merged and rebased with master). But rebase failed each time I tried...