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

BSQ swaps: Refactorings (non funtional changes) [1] #5769

Merged
merged 41 commits into from Nov 4, 2021
Merged

BSQ swaps: Refactorings (non funtional changes) [1] #5769

merged 41 commits into from Nov 4, 2021

Conversation

chimp1984
Copy link
Contributor

@chimp1984 chimp1984 commented Oct 20, 2021 •
edited

Based on https://github.com/bisq-network/bisq/tree/release/v1.7.5

This contains only renaming, moving and increasing visibility (package scope to public) as preparation for the further BSQ swap PRs.

EDIT: Merged with master and rebased.

@chimp1984 chimp1984 marked this pull request as ready for review October 20, 2021 10:21
@chimp1984 chimp1984 mentioned this pull request Oct 20, 2021
Merged
@ghubstan
Copy link
Member

The build fails because bisq.desktop.main.offer.bisq_v1.createoffer.CreateOfferDataModel is package protected, but this refactoring looks fine to me.

@ghubstan
Copy link
Member

ghubstan commented Oct 21, 2021 •
edited

ACK API tests pass for this branch.

@chimp1984 chimp1984 changed the title Refactorings (non funtional changes) Refactorings (non funtional changes) [1] Oct 21, 2021
@chimp1984
Copy link
Contributor Author

No idea why the gradle dependencyVerification fails. It is the same content as in the release branch.

@chimp1984 chimp1984 changed the title Refactorings (non funtional changes) [1] BSQ swaps: Refactorings (non funtional changes) [1] Oct 21, 2021
@chimp1984
Move OfferPayload into package bisq.core.offer.bisq_v1
0942d8f
@chimp1984
Move CreateOfferService into package bisq.core.offer.bisq_v1
3838b45
@chimp1984
Move MarketPriceNotAvailableException into package bisq.core.offer.bi…
76441ff 
…sq_v1
@chimp1984
Move MutableOfferPayloadFields into package bisq.core.offer.bisq_v1
b93295a
@chimp1984
Move TriggerPriceService into package bisq.core.offer.bisq_v1
990c62b
@chimp1984
Move TakeOfferModel into package bisq.core.offer.bisq_v1
0e8ff7d
@chimp1984
Move AvailabilityResult into package bisq.core.offer.availability
ab91be8
@chimp1984
Move bisq.core.offer.messages package into package bisq.core.offer.av…
fa9896d 
…ailability
@chimp1984
Move content of bisq.core.offer.placeoffer package into package bisq.…
aa02ac8 
…core.offer.placeoffer.bisq_v1
@chimp1984
Rename OfferFilter to OfferFilterService
4b968ce
@chimp1984
Move Contract, SellerAsMakerTrade, SellerAsTakerTrade, SellerTrade,
09aa24c 
BuyerAsMakerTrade, BuyerAsTakerTrade, BuyerTrade
to bisq.core.trade.model.bisq_v1 package
@chimp1984
Make updateDepositTxFromWallet public
b580a61
@chimp1984
Move Trade to bisq.core.trade.model.bisq_v1 package
4dc7121
@chimp1984
Move MakerTrade and TakerTrade to bisq.core.trade.model package
2b57309
@chimp1984
Move Tradable to bisq.core.trade.model package
eef55b7
@chimp1984
Move TradableList to bisq.core.trade.model package
5b59d50
@chimp1984
Make FluentProtocol.Event public
838f7e2
@chimp1984
Make setup in FluentProtocol public
e2f8236
@chimp1984
Move protocol classes to bisq.core.trade.protocol.bisq_v1 package
21e9bb4
@chimp1984
Move tasks package into bisq.core.trade.protocol.bisq_v1 package
8305434
@chimp1984
Move TradingPeer into bisq.core.trade.protocol.bisq_v1 package
97903e6
@chimp1984
Move messages package into bisq.core.trade.protocol.bisq_v1 package
69ca8de 
Move TradeMessage into bisq.core.trade.protocol package
@chimp1984
Move ClosedTradableManager, FailedTradesManager into bisq.core.trade.…
c090116 
…bisq_v1 package
@chimp1984
Rename CleanupMailboxMessages to CleanupMailboxMessagesService
bd7af46
@chimp1984
Move CleanupMailboxMessagesService, ClosedTradeUtil to package bisq.c…
0bc5ede 
…ore.trade.bisq_v1
@chimp1984
Move TransactionResultHandler, TradeResultHandler to package bisq.cor…
3b7a14c 
…e.trade.bisq_v1
@chimp1984
Move TradeDataValidation, DumpDelayedPayoutTx, TradeDataValidation, T…
ac8dd03 
…radeUtil, TradeTxException to package bisq.core.trade.bisq_v1
@chimp1984
Rename ProcessModelServiceProvider to Provider
449472e
@chimp1984
Rename txID to txId
3dd4a75
@chimp1984
Move createoffer package inside bisq.desktop.main.offer.bisq_v1 package
f25d0d1
@chimp1984
Move takeoffer package inside bisq.desktop.main.offer.bisq_v1 package
9a1306a
@chimp1984
Move MutableOffer view classes into bisq.desktop.main.offer.bisq_v1 p…
cc4b001 
…ackage
@chimp1984
Move OfferDataModel, OfferViewUtil into bisq.desktop.main.offer.bisq_…
4ebbaa3 
…v1 package
@chimp1984
Rename FeeUtil to OfferViewModelUtil
fbfdaf4
@chimp1984
Move OfferViewModelUtil into bisq.desktop.main.offer.bisq_v1 package
3b5b20d
@chimp1984
Cleanups, refromatting, add final qualifier
6a8f612
@chimp1984
Move TradingPeer to package bisq.core.trade.protocol.bisq_v1.model
3bb303b
@chimp1984
Make setPaymentStartedAckMessage and setDepositTxSentAckMessage public
993c602
@chimp1984
Move ProcessModel to package bisq.core.trade.protocol.bisq_v1.model
ed13d72
@chimp1984
Cleanups
7d48cdb
@ripcurlx ripcurlx merged commit d5dfdb4 into bisq-network:master Nov 4, 2021
@chimp1984 chimp1984 deleted the chimp-bsq-swap branch November 4, 2021 11:05
@ghubstan ghubstan mentioned this pull request Nov 15, 2021
Closed
@chimp1984 chimp1984 mentioned this pull request Nov 17, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghubstan ghubstan ghubstan left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@chimp1984 @ghubstan @ripcurlx