[bisq-network/bisq] Move utility logic from desktop offer models to OfferUtil (2) (#4666)

Stan notifications at github.com
Sat Oct 17 20:10:27 UTC 2020


This is the second preliminary refactoring to prepare for a new core.api `takeoffer` impl.  This effort is restrained by desktop models' dependencies on JFX properties, which cannot be used as arguments to the core `OfferUtil`.

https://github.com/bisq-network/bisq/pull/4654 has to be reviewed & merged before this PR.
    
Changes include:
    
- Moving utility logic into `OfferUtil` from `OfferDataModel` and `MutableOfferDataModel`.
    
- Injecting `OfferUtil` into `TakeOfferDataModel`, for parent `OfferDataModel`.
    
- Removing unused `TradeManager` from `OfferBook`.
    
- Moving `isHalCashAccount` acct type check to abstract `PaymentAccount`.
    
- Moving `getTradeCurrency` logic to abstract `PaymentAccount` from `MutableOfferDataModel`'s `setTradeCurrencyFromPaymentAccount`, and changing affected classes:  `MutableOfferView`, `MutableOfferViewModel`.

You can view, comment on, or merge this pull request online at:

  https://github.com/bisq-network/bisq/pull/4666

-- Commit Summary --

  * Refactor OfferUtil into an injected service
  * Reformat, tidy up OfferUtil
  * Add license comment, reformat CoinUtilTest
  * Reformat desktop createoffer view & data model tests
  * Reformat desktop EditOfferDataModelTest
  * Resolve argument reassignment issue (found by codacy)
  * Remove unused final fields (found by codacy)
  * Move utility logic from desktop offer models to OfferUtil

-- File Changes --

    M core/src/main/java/bisq/core/api/CoreOffersService.java (6)
    M core/src/main/java/bisq/core/offer/CreateOfferService.java (37)
    D core/src/main/java/bisq/core/offer/MakerFeeProvider.java (29)
    M core/src/main/java/bisq/core/offer/Offer.java (5)
    M core/src/main/java/bisq/core/offer/OfferUtil.java (393)
    M core/src/main/java/bisq/core/payment/PaymentAccount.java (24)
    M core/src/main/java/bisq/core/trade/Contract.java (6)
    M core/src/main/java/bisq/core/trade/Trade.java (6)
    M core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java (4)
    A core/src/main/java/bisq/core/util/VolumeUtil.java (50)
    M core/src/main/java/bisq/core/util/coin/CoinUtil.java (109)
    D core/src/test/java/bisq/core/util/CoinCryptoUtilsTest.java (60)
    R core/src/test/java/bisq/core/util/coin/CoinUtilTest.java (56)
    D desktop/src/main/java/bisq/desktop/main/offer/MakerFeeProvider.java (13)
    M desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java (94)
    M desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java (2)
    M desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java (31)
    M desktop/src/main/java/bisq/desktop/main/offer/OfferDataModel.java (26)
    M desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModel.java (6)
    M desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java (6)
    M desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java (7)
    M desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java (22)
    M desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java (33)
    M desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java (6)
    M desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java (6)
    M desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java (36)
    M desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java (44)
    M desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java (29)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/4666.patch
https://github.com/bisq-network/bisq/pull/4666.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/4666
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20201017/4a80cafb/attachment-0001.html>


More information about the bisq-github mailing list