mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 22:45:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move ClosedTradableManager, FailedTradesManager into bisq.core.trade.bisq_v1 package

Browse source
This commit is contained in:
chimp1984 2021-10-19 23:06:05 +02:00
parent 69ca8de0d9
commit c090116f04
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
22 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/api/CoreTradesService.java
View file

@ -24,7 +24,7 @@ import bisq.core.offer.OfferUtil;
import bisq.core.offer.bisq_v1.TakeOfferModel;
import bisq.core.trade.TradeManager;
import bisq.core.trade.TradeUtil;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.BuyerProtocol;

4
core/src/main/java/bisq/core/app/DomainInitialisation.java
View file

@ -49,8 +49,8 @@ import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
import bisq.core.support.traderchat.TraderChatManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.trade.txproof.xmr.XmrTxProofService;
import bisq.core.user.User;

4
core/src/main/java/bisq/core/btc/Balances.java
View file

@ -25,8 +25,8 @@ import bisq.core.offer.OpenOfferManager;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.common.UserThread;

2
core/src/main/java/bisq/core/offer/OpenOfferManager.java
View file

@ -38,7 +38,7 @@ import bisq.core.provider.price.PriceFeedService;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.handlers.TransactionResultHandler;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.statistics.TradeStatisticsManager;

4
core/src/main/java/bisq/core/setup/CorePersistedDataHost.java
View file

@ -30,8 +30,8 @@ import bisq.core.support.dispute.arbitration.ArbitrationDisputeListService;
import bisq.core.support.dispute.mediation.MediationDisputeListService;
import bisq.core.support.dispute.refund.RefundDisputeListService;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.user.Preferences;
import bisq.core.user.User;

2
core/src/main/java/bisq/core/support/dispute/DisputeManager.java
View file

@ -37,7 +37,7 @@ import bisq.core.support.dispute.messages.PeerOpenedDisputeMessage;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.model.bisq_v1.Trade;

2
core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
View file

@ -41,7 +41,7 @@ import bisq.core.support.dispute.messages.PeerOpenedDisputeMessage;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.messages.SupportMessage;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.model.bisq_v1.Trade;

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

@ -36,7 +36,7 @@ import bisq.core.support.dispute.messages.PeerOpenedDisputeMessage;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.messages.SupportMessage;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.ProcessModel;
import bisq.core.trade.protocol.bisq_v1.DisputeProtocol;

2
core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java
View file

@ -36,7 +36,7 @@ import bisq.core.support.dispute.messages.PeerOpenedDisputeMessage;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.messages.SupportMessage;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.network.p2p.AckMessageSourceType;

4
core/src/main/java/bisq/core/support/traderchat/TraderChatManager.java
View file

@ -24,8 +24,8 @@ import bisq.core.support.SupportType;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.messages.SupportMessage;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.network.p2p.AckMessageSourceType;

4
core/src/main/java/bisq/core/trade/TradeManager.java
View file

@ -30,8 +30,8 @@ import bisq.core.offer.bisq_v1.OfferPayload;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.handlers.TradeResultHandler;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;

4
core/src/main/java/bisq/core/trade/TradeModule.java
View file

@ -21,8 +21,8 @@ import bisq.core.account.sign.SignedWitnessService;
import bisq.core.account.sign.SignedWitnessStorageService;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.account.witness.AccountAgeWitnessStorageService;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.statistics.ReferralIdService;
import bisq.common.app.AppModule;

3
core/src/main/java/bisq/core/trade/closed/ClosedTradableManager.java → core/src/main/java/bisq/core/trade/bisq_v1/ClosedTradableManager.java
View file

@ -15,11 +15,12 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.closed;
package bisq.core.trade.bisq_v1;
import bisq.core.offer.Offer;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.DumpDelayedPayoutTx;
import bisq.core.trade.closed.CleanupMailboxMessages;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.bisq_v1.Trade;

2
core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java → core/src/main/java/bisq/core/trade/bisq_v1/FailedTradesManager.java
View file

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.failed;
package bisq.core.trade.bisq_v1;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;

1
core/src/main/java/bisq/core/trade/closed/ClosedTradeUtil.java
View file

@ -25,6 +25,7 @@ import bisq.core.monetary.Price;
import bisq.core.monetary.Volume;
import bisq.core.offer.Offer;
import bisq.core.offer.OpenOffer;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.statistics.TradeStatisticsManager;

4
core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
View file

@ -23,8 +23,8 @@ import bisq.core.locale.Res;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.model.bisq_v1.SellerTrade;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.SellerProtocol;

4
desktop/src/main/java/bisq/desktop/main/funds/transactions/TradableRepository.java
View file

@ -19,8 +19,8 @@ package bisq.desktop.main.funds.transactions;
import bisq.core.offer.OpenOfferManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.model.Tradable;
import javax.inject.Inject;

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

@ -45,7 +45,7 @@ import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountUtil;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.user.Preferences;
import bisq.core.user.User;

2
desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.java
View file

@ -33,7 +33,7 @@ import bisq.desktop.main.portfolio.pendingtrades.PendingTradesView;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.bisq_v1.OfferPayload;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.model.bisq_v1.Trade;
import javax.inject.Inject;

2
desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java
View file

@ -26,7 +26,7 @@ import bisq.core.offer.Offer;
import bisq.core.offer.bisq_v1.OfferPayload;
import bisq.core.provider.price.MarketPrice;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.closed.ClosedTradeUtil;
import bisq.core.trade.model.Tradable;
import bisq.core.user.Preferences;

2
desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java
View file

@ -22,7 +22,7 @@ import bisq.desktop.common.model.ActivatableDataModel;
import bisq.core.offer.Offer;
import bisq.core.offer.bisq_v1.OfferPayload;
import bisq.core.trade.TradeManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.network.p2p.NodeAddress;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View file

@ -33,7 +33,7 @@ import bisq.core.offer.OfferUtil;
import bisq.core.provider.fee.FeeService;
import bisq.core.provider.mempool.MempoolService;
import bisq.core.trade.TradeUtil;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.user.User;