From 71eec7b2e0c98b8b036d4ab3fa52cc4701e0fc30 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Wed, 20 Oct 2021 00:19:42 +0200 Subject: [PATCH] Move TradingPeer to package bisq.core.trade.protocol.bisq_v1.model --- .../bisq/core/account/witness/AccountAgeWitnessService.java | 2 +- .../core/trade/protocol/bisq_v1/{ => model}/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 +- 15 files changed, 15 insertions(+), 15 deletions(-) rename core/src/main/java/bisq/core/trade/protocol/bisq_v1/{ => model}/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 115461e6f0..91dd9125b1 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.TradingPeer; import bisq.core.user.User; import bisq.network.p2p.BootstrapListener; diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/TradingPeer.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/TradingPeer.java similarity index 99% rename from core/src/main/java/bisq/core/trade/protocol/bisq_v1/TradingPeer.java rename to core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/TradingPeer.java index 9388b30f1c..139234d6d8 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/TradingPeer.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/TradingPeer.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.trade.protocol.bisq_v1; +package bisq.core.trade.protocol.bisq_v1.model; 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 a686a6c597..8d20f99191 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 6b8b2d9d51..42ae03a699 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 33ddfe047c..3433d9e26b 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 bbf3f8c6cf..dd89daa00d 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 d1154591ec..6d420f9a06 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 @@ -21,8 +21,8 @@ import bisq.core.exceptions.TradePriceOutOfToleranceException; import bisq.core.offer.Offer; import bisq.core.support.dispute.mediation.mediator.Mediator; 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.model.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 0c3937d34a..3a79f0088a 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 fb765b93fe..674884593a 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 e361c0f08e..5416aaf58c 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 @@ -18,8 +18,8 @@ package bisq.core.trade.protocol.bisq_v1.tasks.seller; 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.model.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 d1a88fe5ae..1081efee59 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 66a588368b..1f5af08605 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 e6e01d7abf..14aecaec27 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.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 46b0301924..dc451c6f18 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 @@ -19,8 +19,8 @@ package bisq.core.trade.protocol.bisq_v1.tasks.taker; import bisq.core.btc.wallet.Restrictions; 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.model.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 fa3f158824..f2bbea4298 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.bisq_v1.TradingPeer; +import bisq.core.trade.protocol.bisq_v1.model.TradingPeer; import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask; import bisq.network.p2p.NodeAddress;