mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move messages package into bisq.core.trade.protocol.bisq_v1 package

Browse Source 
Move TradeMessage into bisq.core.trade.protocol package
This commit is contained in:
chimp1984 2021-10-19 23:04:29 +02:00
parent 97903e6a5a
commit 69ca8de0d9
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
57 changed files with 112 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/ValidateOffer.java
View File

@ -19,7 +19,7 @@ package bisq.core.offer.placeoffer.bisq_v1.tasks;
import bisq.core.offer.Offer;
import bisq.core.offer.placeoffer.bisq_v1.PlaceOfferModel;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.protocol.TradeMessage;
import bisq.common.taskrunner.Task;
import bisq.common.taskrunner.TaskRunner;

28
core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java
View File

@ -48,20 +48,20 @@ import bisq.core.support.dispute.messages.OpenNewDisputeMessage;
import bisq.core.support.dispute.messages.PeerOpenedDisputeMessage;
import bisq.core.support.dispute.refund.refundagent.RefundAgent;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.DepositTxMessage;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.messages.InputsForDepositTxResponse;
import bisq.core.trade.messages.MediatedPayoutTxPublishedMessage;
import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.messages.PeerPublishedDelayedPayoutTxMessage;
import bisq.core.trade.messages.RefreshTradeStateRequest;
import bisq.core.trade.messages.ShareBuyerPaymentAccountMessage;
import bisq.core.trade.messages.TraderSignedWitnessMessage;
import bisq.core.trade.protocol.bisq_v1.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxRequest;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxResponse;
import bisq.core.trade.protocol.bisq_v1.messages.MediatedPayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.protocol.bisq_v1.messages.PayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.PeerPublishedDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.RefreshTradeStateRequest;
import bisq.core.trade.protocol.bisq_v1.messages.ShareBuyerPaymentAccountMessage;
import bisq.core.trade.protocol.bisq_v1.messages.TraderSignedWitnessMessage;
import bisq.network.p2p.AckMessage;
import bisq.network.p2p.BundleOfEnvelopes;

2
core/src/main/java/bisq/core/trade/TradeManager.java
View File

@ -33,7 +33,6 @@ import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.handlers.TradeResultHandler;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.BuyerAsTakerTrade;
@ -46,6 +45,7 @@ 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.statistics.ReferralIdService;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.user.User;

2
core/src/main/java/bisq/core/trade/closed/CleanupMailboxMessages.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.closed;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeMessage;
import bisq.network.p2p.AckMessage;
import bisq.network.p2p.AckMessageSourceType;

1
core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
View File

@ -17,7 +17,6 @@
package bisq.core.trade.protocol;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.network.p2p.NodeAddress;

1
core/src/main/java/bisq/core/trade/protocol/ProcessModel.java
View File

@ -34,7 +34,6 @@ 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.TradeManager;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.MakerTrade;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.TradingPeer;

2
core/src/main/java/bisq/core/trade/messages/TradeMessage.java → core/src/main/java/bisq/core/trade/protocol/TradeMessage.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol;
import bisq.network.p2p.UidMessage;

5
core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
View File

@ -19,10 +19,9 @@ package bisq.core.trade.protocol;
import bisq.core.offer.Offer;
import bisq.core.trade.TradeManager;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.TradeMessage;
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.network.p2p.AckMessage;
import bisq.network.p2p.AckMessageSourceType;

8
core/src/main/java/bisq/core/trade/protocol/bisq_v1/BuyerAsMakerProtocol.java
View File

@ -17,13 +17,13 @@
package bisq.core.trade.protocol.bisq_v1;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeTaskRunner;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxRequest;
import bisq.core.trade.protocol.bisq_v1.messages.PayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.ApplyFilter;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.trade.protocol.bisq_v1.tasks.buyer.BuyerFinalizesDelayedPayoutTx;

10
core/src/main/java/bisq/core/trade/protocol/bisq_v1/BuyerAsTakerProtocol.java
View File

@ -19,13 +19,13 @@ package bisq.core.trade.protocol.bisq_v1;
import bisq.core.offer.Offer;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.InputsForDepositTxResponse;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.BuyerAsTakerTrade;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxResponse;
import bisq.core.trade.protocol.bisq_v1.messages.PayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.ApplyFilter;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.trade.protocol.bisq_v1.tasks.buyer.BuyerFinalizesDelayedPayoutTx;

8
core/src/main/java/bisq/core/trade/protocol/bisq_v1/BuyerProtocol.java
View File

@ -17,14 +17,14 @@
package bisq.core.trade.protocol.bisq_v1;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.BuyerTrade;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.FluentProtocol;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.TradeTaskRunner;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.PayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.ApplyFilter;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.trade.protocol.bisq_v1.tasks.VerifyPeersAccountAgeWitness;

8
core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java
View File

@ -17,14 +17,14 @@
package bisq.core.trade.protocol.bisq_v1;
import bisq.core.trade.messages.MediatedPayoutTxPublishedMessage;
import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.messages.PeerPublishedDelayedPayoutTxMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.FluentProtocol;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.TradeProtocol;
import bisq.core.trade.protocol.TradeTaskRunner;
import bisq.core.trade.protocol.bisq_v1.messages.MediatedPayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.protocol.bisq_v1.messages.PeerPublishedDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.ApplyFilter;
import bisq.core.trade.protocol.bisq_v1.tasks.ProcessPeerPublishedDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.arbitration.PublishedDelayedPayoutTx;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/MakerProtocol.java
View File

@ -18,7 +18,7 @@
package bisq.core.trade.protocol.bisq_v1;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxRequest;
import bisq.network.p2p.NodeAddress;

10
core/src/main/java/bisq/core/trade/protocol/bisq_v1/SellerAsMakerProtocol.java
View File

@ -18,14 +18,14 @@
package bisq.core.trade.protocol.bisq_v1;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.messages.DepositTxMessage;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.SellerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.TradeTaskRunner;
import bisq.core.trade.protocol.bisq_v1.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxRequest;
import bisq.core.trade.protocol.bisq_v1.tasks.ApplyFilter;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.trade.protocol.bisq_v1.tasks.maker.MakerCreateAndSignContract;

8
core/src/main/java/bisq/core/trade/protocol/bisq_v1/SellerAsTakerProtocol.java
View File

@ -19,12 +19,12 @@ package bisq.core.trade.protocol.bisq_v1;
import bisq.core.offer.Offer;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.messages.InputsForDepositTxResponse;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.bisq_v1.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxResponse;
import bisq.core.trade.protocol.bisq_v1.tasks.ApplyFilter;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.trade.protocol.bisq_v1.tasks.seller.SellerCreatesDelayedPayoutTx;

8
core/src/main/java/bisq/core/trade/protocol/bisq_v1/SellerProtocol.java
View File

@ -17,14 +17,14 @@
package bisq.core.trade.protocol.bisq_v1;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.messages.ShareBuyerPaymentAccountMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.SellerTrade;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.FluentProtocol;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.TradeTaskRunner;
import bisq.core.trade.protocol.bisq_v1.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.protocol.bisq_v1.messages.ShareBuyerPaymentAccountMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.ApplyFilter;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.trade.protocol.bisq_v1.tasks.VerifyPeersAccountAgeWitness;

2
core/src/main/java/bisq/core/trade/messages/CounterCurrencyTransferStartedMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/CounterCurrencyTransferStartedMessage.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.network.p2p.NodeAddress;

4
core/src/main/java/bisq/core/trade/messages/DelayedPayoutTxSignatureRequest.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/DelayedPayoutTxSignatureRequest.java
View File

@ -15,7 +15,9 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.trade.protocol.TradeMessage;
import bisq.network.p2p.DirectMessage;
import bisq.network.p2p.NodeAddress;

4
core/src/main/java/bisq/core/trade/messages/DelayedPayoutTxSignatureResponse.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/DelayedPayoutTxSignatureResponse.java
View File

@ -15,7 +15,9 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.trade.protocol.TradeMessage;
import bisq.network.p2p.DirectMessage;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/messages/DepositTxAndDelayedPayoutTxMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/DepositTxAndDelayedPayoutTxMessage.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.proto.CoreProtoResolver;

4
core/src/main/java/bisq/core/trade/messages/DepositTxMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/DepositTxMessage.java
View File

@ -15,7 +15,9 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.trade.protocol.TradeMessage;
import bisq.network.p2p.DirectMessage;
import bisq.network.p2p.NodeAddress;

3
core/src/main/java/bisq/core/trade/messages/InputsForDepositTxRequest.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/InputsForDepositTxRequest.java
View File

@ -15,11 +15,12 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.btc.model.RawTransactionInput;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.proto.CoreProtoResolver;
import bisq.core.trade.protocol.TradeMessage;
import bisq.network.p2p.DirectMessage;
import bisq.network.p2p.NodeAddress;

3
core/src/main/java/bisq/core/trade/messages/InputsForDepositTxResponse.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/InputsForDepositTxResponse.java
View File

@ -15,11 +15,12 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.btc.model.RawTransactionInput;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.proto.CoreProtoResolver;
import bisq.core.trade.protocol.TradeMessage;
import bisq.network.p2p.DirectMessage;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/messages/MediatedPayoutTxPublishedMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/MediatedPayoutTxPublishedMessage.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/messages/MediatedPayoutTxSignatureMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/MediatedPayoutTxSignatureMessage.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/messages/PayoutTxPublishedMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/PayoutTxPublishedMessage.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.account.sign.SignedWitness;

2
core/src/main/java/bisq/core/trade/messages/PeerPublishedDelayedPayoutTxMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/PeerPublishedDelayedPayoutTxMessage.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/messages/RefreshTradeStateRequest.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/RefreshTradeStateRequest.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/messages/ShareBuyerPaymentAccountMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/ShareBuyerPaymentAccountMessage.java
View File

@ -32,7 +32,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.proto.CoreProtoResolver;

4
core/src/main/java/bisq/core/trade/messages/TradeMailboxMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/TradeMailboxMessage.java
View File

@ -15,7 +15,9 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.trade.protocol.TradeMessage;
import bisq.network.p2p.mailbox.MailboxMessage;

2
core/src/main/java/bisq/core/trade/messages/TraderSignedWitnessMessage.java → core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/TraderSignedWitnessMessage.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.messages;
package bisq.core.trade.protocol.bisq_v1.messages;
import bisq.core.account.sign.SignedWitness;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ProcessPeerPublishedDelayedPayoutTxMessage.java
View File

@ -18,8 +18,8 @@
package bisq.core.trade.protocol.bisq_v1.tasks;
import bisq.core.btc.wallet.WalletService;
import bisq.core.trade.messages.PeerPublishedDelayedPayoutTxMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.PeerPublishedDelayedPayoutTxMessage;
import bisq.core.util.Validator;
import bisq.common.taskrunner.TaskRunner;

4
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/SendMailboxMessageTask.java
View File

@ -17,9 +17,9 @@
package bisq.core.trade.protocol.bisq_v1.tasks;
import bisq.core.trade.messages.TradeMailboxMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.bisq_v1.messages.TradeMailboxMessage;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.SendMailboxMessageListener;

4
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/arbitration/SendPeerPublishedDelayedPayoutTxMessage.java
View File

@ -17,9 +17,9 @@
package bisq.core.trade.protocol.bisq_v1.tasks.arbitration;
import bisq.core.trade.messages.PeerPublishedDelayedPayoutTxMessage;
import bisq.core.trade.messages.TradeMailboxMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.PeerPublishedDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.TradeMailboxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.SendMailboxMessageTask;
import bisq.common.taskrunner.TaskRunner;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerProcessDelayedPayoutTxSignatureRequest.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.bisq_v1.tasks.buyer;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.util.Validator;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerProcessDepositTxAndDelayedPayoutTxMessage.java
View File

@ -21,10 +21,10 @@ import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletService;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
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.tasks.TradeTask;
import bisq.core.util.Validator;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java
View File

@ -20,8 +20,8 @@ package bisq.core.trade.protocol.bisq_v1.tasks.buyer;
import bisq.core.account.sign.SignedWitness;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletService;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.PayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.util.Validator;

6
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerSendCounterCurrencyTransferStartedMessage.java
View File

@ -19,10 +19,10 @@ package bisq.core.trade.protocol.bisq_v1.tasks.buyer;
import bisq.core.btc.model.AddressEntry;
import bisq.core.network.MessageState;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.TradeMailboxMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.bisq_v1.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.TradeMailboxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.SendMailboxMessageTask;
import bisq.common.Timer;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerSendsDelayedPayoutTxSignatureResponse.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.bisq_v1.tasks.buyer;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.network.p2p.NodeAddress;

6
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerSendsShareBuyerPaymentAccountMessage.java
View File

@ -36,10 +36,10 @@ package bisq.core.trade.protocol.bisq_v1.tasks.buyer;
import bisq.core.network.MessageState;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.messages.ShareBuyerPaymentAccountMessage;
import bisq.core.trade.messages.TradeMailboxMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.bisq_v1.messages.ShareBuyerPaymentAccountMessage;
import bisq.core.trade.protocol.bisq_v1.messages.TradeMailboxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.SendMailboxMessageTask;
import bisq.common.Timer;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_taker/BuyerAsTakerSendsDepositTxMessage.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.bisq_v1.tasks.buyer_as_taker;
import bisq.core.trade.messages.DepositTxMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerProcessesInputsForDepositTxRequest.java
View File

@ -20,9 +20,9 @@ package bisq.core.trade.protocol.bisq_v1.tasks.maker;
import bisq.core.exceptions.TradePriceOutOfToleranceException;
import bisq.core.offer.Offer;
import bisq.core.support.dispute.mediation.mediator.Mediator;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.TradingPeer;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxRequest;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.user.User;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerSendsInputsForDepositTxResponse.java
View File

@ -19,9 +19,9 @@ 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.messages.InputsForDepositTxResponse;
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.tasks.TradeTask;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/ProcessMediatedPayoutSignatureMessage.java
View File

@ -18,8 +18,8 @@
package bisq.core.trade.protocol.bisq_v1.tasks.mediation;
import bisq.core.support.dispute.mediation.MediationResultState;
import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.util.Validator;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java
View File

@ -19,8 +19,8 @@ package bisq.core.trade.protocol.bisq_v1.tasks.mediation;
import bisq.core.btc.wallet.WalletService;
import bisq.core.support.dispute.mediation.MediationResultState;
import bisq.core.trade.messages.MediatedPayoutTxPublishedMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.MediatedPayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.util.Validator;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/SendMediatedPayoutSignatureMessage.java
View File

@ -18,9 +18,9 @@
package bisq.core.trade.protocol.bisq_v1.tasks.mediation;
import bisq.core.support.dispute.mediation.MediationResultState;
import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.network.p2p.NodeAddress;

4
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/SendMediatedPayoutTxPublishedMessage.java
View File

@ -18,9 +18,9 @@
package bisq.core.trade.protocol.bisq_v1.tasks.mediation;
import bisq.core.support.dispute.mediation.MediationResultState;
import bisq.core.trade.messages.MediatedPayoutTxPublishedMessage;
import bisq.core.trade.messages.TradeMailboxMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.MediatedPayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.TradeMailboxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.SendMailboxMessageTask;
import bisq.common.taskrunner.TaskRunner;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java
View File

@ -17,9 +17,9 @@
package bisq.core.trade.protocol.bisq_v1.tasks.seller;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.TradingPeer;
import bisq.core.trade.protocol.bisq_v1.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.util.Validator;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessDelayedPayoutTxSignatureResponse.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.bisq_v1.tasks.seller;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.common.taskrunner.TaskRunner;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessShareBuyerPaymentAccountMessage.java
View File

@ -35,10 +35,10 @@
package bisq.core.trade.protocol.bisq_v1.tasks.seller;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.messages.ShareBuyerPaymentAccountMessage;
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.tasks.TradeTask;
import bisq.common.crypto.Sig;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerSendDelayedPayoutTxSignatureRequest.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.bisq_v1.tasks.seller;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.network.p2p.NodeAddress;

4
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerSendPayoutTxPublishedMessage.java
View File

@ -19,9 +19,9 @@ package bisq.core.trade.protocol.bisq_v1.tasks.seller;
import bisq.core.account.sign.SignedWitness;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.messages.TradeMailboxMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.PayoutTxPublishedMessage;
import bisq.core.trade.protocol.bisq_v1.messages.TradeMailboxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.SendMailboxMessageTask;
import bisq.common.taskrunner.TaskRunner;

6
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerSendsDepositTxAndDelayedPayoutTxMessage.java
View File

@ -19,10 +19,10 @@ package bisq.core.trade.protocol.bisq_v1.tasks.seller;
import bisq.core.network.MessageState;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.TradeMailboxMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.TradeMessage;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.protocol.bisq_v1.messages.TradeMailboxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.SendMailboxMessageTask;
import bisq.common.Timer;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_maker/SellerAsMakerProcessDepositTxMessage.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.bisq_v1.tasks.seller_as_maker;
import bisq.core.trade.messages.DepositTxMessage;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.messages.DepositTxMessage;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.core.util.Validator;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerProcessesInputsForDepositTxResponse.java
View File

@ -18,9 +18,9 @@
package bisq.core.trade.protocol.bisq_v1.tasks.taker;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.trade.messages.InputsForDepositTxResponse;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.TradingPeer;
import bisq.core.trade.protocol.bisq_v1.messages.InputsForDepositTxResponse;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;
import bisq.common.config.Config;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerSendInputsForDepositTxRequest.java
View File

@ -19,9 +19,9 @@ 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.messages.InputsForDepositTxRequest;
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.tasks.TradeTask;
import bisq.core.user.User;

2
core/src/main/java/bisq/core/util/Validator.java
View File

@ -17,7 +17,7 @@
package bisq.core.util;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.protocol.TradeMessage;
import org.bitcoinj.core.Coin;