From 734d429cc9612709bcee8c0e4784070406daf731 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Wed, 20 Oct 2021 00:20:22 +0200 Subject: [PATCH] Move ProcessModel to package bisq.core.trade.protocol.bisq_v1.model --- .../core/support/dispute/mediation/MediationManager.java | 2 +- core/src/main/java/bisq/core/trade/TradeManager.java | 2 +- .../bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java | 2 +- .../bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java | 2 +- .../main/java/bisq/core/trade/model/bisq_v1/BuyerTrade.java | 2 +- .../bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java | 2 +- .../bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java | 2 +- .../main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java | 2 +- core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java | 2 +- .../main/java/bisq/core/trade/protocol/TradeProtocol.java | 1 + .../trade/protocol/{ => bisq_v1/model}/ProcessModel.java | 5 +++-- .../bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java | 2 +- .../BuyerProcessDepositTxAndDelayedPayoutTxMessage.java | 2 +- .../bisq_v1/tasks/maker/MakerCreateAndSignContract.java | 2 +- .../tasks/maker/MakerSendsInputsForDepositTxResponse.java | 2 +- .../seller/SellerProcessShareBuyerPaymentAccountMessage.java | 2 +- .../tasks/taker/TakerSendInputsForDepositTxRequest.java | 2 +- .../bisq_v1/tasks/taker/TakerVerifyAndSignContract.java | 2 +- 18 files changed, 20 insertions(+), 18 deletions(-) rename core/src/main/java/bisq/core/trade/protocol/{ => bisq_v1/model}/ProcessModel.java (99%) diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java b/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java index ef563e4627..481525606a 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java +++ b/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java @@ -38,8 +38,8 @@ import bisq.core.support.messages.SupportMessage; import bisq.core.trade.TradeManager; 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; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.network.p2p.AckMessageSourceType; import bisq.network.p2p.NodeAddress; diff --git a/core/src/main/java/bisq/core/trade/TradeManager.java b/core/src/main/java/bisq/core/trade/TradeManager.java index 09f2aae7c4..aa9d1e2ed7 100644 --- a/core/src/main/java/bisq/core/trade/TradeManager.java +++ b/core/src/main/java/bisq/core/trade/TradeManager.java @@ -42,13 +42,13 @@ import bisq.core.trade.model.bisq_v1.BuyerAsTakerTrade; import bisq.core.trade.model.bisq_v1.SellerAsMakerTrade; import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.ProcessModel; import bisq.core.trade.protocol.Provider; import bisq.core.trade.protocol.TradeProtocol; import bisq.core.trade.protocol.TradeProtocolFactory; import bisq.core.trade.protocol.bisq_v1.MakerProtocol; import bisq.core.trade.protocol.bisq_v1.TakerProtocol; import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxRequest; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.core.trade.statistics.ReferralIdService; import bisq.core.trade.statistics.TradeStatisticsManager; import bisq.core.user.User; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java index b6bff65a2e..05e5369940 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java @@ -22,7 +22,7 @@ import bisq.core.offer.Offer; import bisq.core.proto.CoreProtoResolver; import bisq.core.trade.model.MakerTrade; import bisq.core.trade.model.Tradable; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.network.p2p.NodeAddress; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java index cb0a713fcd..b8125c168f 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java @@ -22,7 +22,7 @@ import bisq.core.offer.Offer; import bisq.core.proto.CoreProtoResolver; import bisq.core.trade.model.TakerTrade; import bisq.core.trade.model.Tradable; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.network.p2p.NodeAddress; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerTrade.java index 6f85988117..9b0917f273 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerTrade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerTrade.java @@ -19,7 +19,7 @@ package bisq.core.trade.model.bisq_v1; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.offer.Offer; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.network.p2p.NodeAddress; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java index 911e2adabd..372e2d20d5 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java @@ -22,7 +22,7 @@ import bisq.core.offer.Offer; import bisq.core.proto.CoreProtoResolver; import bisq.core.trade.model.MakerTrade; import bisq.core.trade.model.Tradable; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.network.p2p.NodeAddress; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java index 972f347a4b..563c1f4cd1 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java @@ -22,7 +22,7 @@ import bisq.core.offer.Offer; import bisq.core.proto.CoreProtoResolver; import bisq.core.trade.model.TakerTrade; import bisq.core.trade.model.Tradable; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.network.p2p.NodeAddress; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java index 16c16029a5..2284b2baaa 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java @@ -20,7 +20,7 @@ package bisq.core.trade.model.bisq_v1; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.locale.CurrencyUtil; import bisq.core.offer.Offer; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.network.p2p.NodeAddress; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java index 75cf84ed81..7589aa10a6 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java @@ -29,8 +29,8 @@ import bisq.core.support.dispute.mediation.MediationResultState; import bisq.core.support.dispute.refund.RefundResultState; import bisq.core.support.messages.ChatMessage; import bisq.core.trade.model.Tradable; -import bisq.core.trade.protocol.ProcessModel; import bisq.core.trade.protocol.Provider; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.core.trade.txproof.AssetTxProofResult; import bisq.core.util.VolumeUtil; diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java index 7d1d61513e..2539f99f8e 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java @@ -22,6 +22,7 @@ import bisq.core.trade.TradeManager; import bisq.core.trade.model.bisq_v1.Trade; import bisq.core.trade.protocol.bisq_v1.messages.CounterCurrencyTransferStartedMessage; import bisq.core.trade.protocol.bisq_v1.messages.DepositTxAndDelayedPayoutTxMessage; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.network.p2p.AckMessage; import bisq.network.p2p.AckMessageSourceType; diff --git a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java similarity index 99% rename from core/src/main/java/bisq/core/trade/protocol/ProcessModel.java rename to core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java index 7e51f29026..7158f026c6 100644 --- a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.trade.protocol; +package bisq.core.trade.protocol.bisq_v1.model; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.btc.model.RawTransactionInput; @@ -36,7 +36,8 @@ import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; import bisq.core.trade.TradeManager; import bisq.core.trade.model.MakerTrade; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.bisq_v1.model.TradingPeer; +import bisq.core.trade.protocol.Provider; +import bisq.core.trade.protocol.TradeMessage; import bisq.core.trade.statistics.ReferralIdService; import bisq.core.trade.statistics.TradeStatisticsManager; import bisq.core.user.User; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java index 5b5e69f607..5b5245bde7 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java @@ -18,7 +18,7 @@ package bisq.core.trade.protocol.bisq_v1.tasks; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.common.taskrunner.Task; import bisq.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerProcessDepositTxAndDelayedPayoutTxMessage.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerProcessDepositTxAndDelayedPayoutTxMessage.java index ae0189445b..b8309578ad 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerProcessDepositTxAndDelayedPayoutTxMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerProcessDepositTxAndDelayedPayoutTxMessage.java @@ -23,8 +23,8 @@ import bisq.core.btc.wallet.WalletService; import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.trade.model.bisq_v1.Contract; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.ProcessModel; import bisq.core.trade.protocol.bisq_v1.messages.DepositTxAndDelayedPayoutTxMessage; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.core.util.Validator; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java index dd89daa00d..ea4909108a 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java @@ -22,7 +22,7 @@ import bisq.core.btc.wallet.BtcWalletService; import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade; import bisq.core.trade.model.bisq_v1.Contract; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.core.trade.protocol.bisq_v1.model.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerSendsInputsForDepositTxResponse.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerSendsInputsForDepositTxResponse.java index 42175488f5..fbe6de792a 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerSendsInputsForDepositTxResponse.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerSendsInputsForDepositTxResponse.java @@ -20,8 +20,8 @@ package bisq.core.trade.protocol.bisq_v1.tasks.maker; import bisq.core.btc.model.AddressEntry; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.ProcessModel; import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxResponse; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.network.p2p.NodeAddress; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessShareBuyerPaymentAccountMessage.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessShareBuyerPaymentAccountMessage.java index 9c108f22bc..7c1bed5201 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessShareBuyerPaymentAccountMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessShareBuyerPaymentAccountMessage.java @@ -37,8 +37,8 @@ package bisq.core.trade.protocol.bisq_v1.tasks.seller; import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.trade.model.bisq_v1.Contract; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.ProcessModel; import bisq.core.trade.protocol.bisq_v1.messages.ShareBuyerPaymentAccountMessage; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.crypto.Sig; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerSendInputsForDepositTxRequest.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerSendInputsForDepositTxRequest.java index 632e07b986..c693912508 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerSendInputsForDepositTxRequest.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerSendInputsForDepositTxRequest.java @@ -20,8 +20,8 @@ package bisq.core.trade.protocol.bisq_v1.tasks.taker; import bisq.core.btc.model.AddressEntry; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.ProcessModel; import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxRequest; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.core.user.User; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java index f2bbea4298..7c325991a7 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java @@ -22,7 +22,7 @@ import bisq.core.btc.wallet.BtcWalletService; import bisq.core.trade.model.bisq_v1.Contract; import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.ProcessModel; +import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; import bisq.core.trade.protocol.bisq_v1.model.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;