From 97903e6a5aa9f1868f62326a6835ac8582241293 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 19 Oct 2021 22:59:08 +0200 Subject: [PATCH] Move TradingPeer into bisq.core.trade.protocol.bisq_v1 package --- .../bisq/core/account/witness/AccountAgeWitnessService.java | 2 +- core/src/main/java/bisq/core/trade/protocol/ProcessModel.java | 1 + .../bisq/core/trade/protocol/{ => bisq_v1}/TradingPeer.java | 2 +- .../protocol/bisq_v1/tasks/VerifyPeersAccountAgeWitness.java | 2 +- .../buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java | 2 +- .../tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java | 2 +- .../bisq_v1/tasks/maker/MakerCreateAndSignContract.java | 2 +- .../tasks/maker/MakerProcessesInputsForDepositTxRequest.java | 2 +- .../bisq_v1/tasks/mediation/FinalizeMediatedPayoutTx.java | 2 +- .../protocol/bisq_v1/tasks/mediation/SignMediatedPayoutTx.java | 2 +- .../SellerProcessCounterCurrencyTransferStartedMessage.java | 2 +- .../bisq_v1/tasks/seller/SellerSignAndFinalizePayoutTx.java | 2 +- .../seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java | 2 +- .../tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java | 2 +- .../tasks/taker/TakerProcessesInputsForDepositTxResponse.java | 2 +- .../bisq_v1/tasks/taker/TakerVerifyAndSignContract.java | 2 +- 16 files changed, 16 insertions(+), 15 deletions(-) rename core/src/main/java/bisq/core/trade/protocol/{ => bisq_v1}/TradingPeer.java (99%) diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java index 35173e9338..115461e6f0 100644 --- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java +++ b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java @@ -35,7 +35,7 @@ import bisq.core.support.dispute.DisputeResult; import bisq.core.support.dispute.arbitration.TraderDataItem; import bisq.core.trade.model.bisq_v1.Contract; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.user.User; import bisq.network.p2p.BootstrapListener; diff --git a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java b/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java index 9830619d25..32f4980c6f 100644 --- a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java +++ b/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java @@ -37,6 +37,7 @@ 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; 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/TradingPeer.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/TradingPeer.java similarity index 99% rename from core/src/main/java/bisq/core/trade/protocol/TradingPeer.java rename to core/src/main/java/bisq/core/trade/protocol/bisq_v1/TradingPeer.java index ebd37a24ea..9388b30f1c 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradingPeer.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/TradingPeer.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.trade.protocol; +package bisq.core.trade.protocol.bisq_v1; import bisq.core.btc.model.RawTransactionInput; import bisq.core.payment.payload.PaymentAccountPayload; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/VerifyPeersAccountAgeWitness.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/VerifyPeersAccountAgeWitness.java index 82ad5409b2..a686a6c597 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/VerifyPeersAccountAgeWitness.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/VerifyPeersAccountAgeWitness.java @@ -22,7 +22,7 @@ import bisq.core.locale.CurrencyUtil; import bisq.core.offer.Offer; import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.common.crypto.PubKeyRing; import bisq.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java index e7b3cfdc23..6b8b2d9d51 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java @@ -23,7 +23,7 @@ import bisq.core.btc.model.RawTransactionInput; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.offer.Offer; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java index f0c31d7ccd..33ddfe047c 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java @@ -22,7 +22,7 @@ import bisq.core.btc.model.RawTransactionInput; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.offer.Offer; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.crypto.Hash; 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 c3d6259fd0..bbf3f8c6cf 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 @@ -23,7 +23,7 @@ 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.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; 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/maker/MakerProcessesInputsForDepositTxRequest.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerProcessesInputsForDepositTxRequest.java index 2139413bd3..28642e1706 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerProcessesInputsForDepositTxRequest.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerProcessesInputsForDepositTxRequest.java @@ -22,7 +22,7 @@ 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.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; 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/mediation/FinalizeMediatedPayoutTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/FinalizeMediatedPayoutTx.java index 3cbe3bcbdf..0c3937d34a 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/FinalizeMediatedPayoutTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/FinalizeMediatedPayoutTx.java @@ -22,7 +22,7 @@ import bisq.core.btc.wallet.BtcWalletService; import bisq.core.offer.Offer; import bisq.core.trade.model.bisq_v1.Contract; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/SignMediatedPayoutTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/SignMediatedPayoutTx.java index c8789873ab..fb765b93fe 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/SignMediatedPayoutTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/mediation/SignMediatedPayoutTx.java @@ -22,7 +22,7 @@ import bisq.core.btc.wallet.BtcWalletService; import bisq.core.offer.Offer; import bisq.core.trade.model.bisq_v1.Contract; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java index a28b228a5d..8d0b556fde 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java @@ -19,7 +19,7 @@ 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.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; 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/seller/SellerSignAndFinalizePayoutTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerSignAndFinalizePayoutTx.java index 810fa4e93e..d1a88fe5ae 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerSignAndFinalizePayoutTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerSignAndFinalizePayoutTx.java @@ -21,7 +21,7 @@ import bisq.core.btc.model.AddressEntry; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.offer.Offer; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java index 5642444067..66a588368b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java @@ -23,7 +23,7 @@ import bisq.core.btc.model.RawTransactionInput; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.offer.Offer; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.crypto.Hash; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java index 1ff88f3d16..e6e01d7abf 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java @@ -23,7 +23,7 @@ import bisq.core.btc.wallet.BtcWalletService; import bisq.core.offer.Offer; import bisq.core.trade.model.bisq_v1.Contract; import bisq.core.trade.model.bisq_v1.Trade; -import bisq.core.trade.protocol.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerProcessesInputsForDepositTxResponse.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerProcessesInputsForDepositTxResponse.java index 682be2c781..61b7c9f550 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerProcessesInputsForDepositTxResponse.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerProcessesInputsForDepositTxResponse.java @@ -20,7 +20,7 @@ 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.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.common.config.Config; 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 0c417e3c36..fa3f158824 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 @@ -23,7 +23,7 @@ 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.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.network.p2p.NodeAddress;