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

Refactoring: Rename CheckIfPeerIsBanned to ApplyFilter

Browse Source
This commit is contained in:
Manfred Karrer 2019-05-02 21:48:51 -05:00
parent 3b613bebce
commit 830e693ace
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import bisq.core.trade.messages.DepositTxPublishedMessage;
import bisq.core.trade.messages.PayDepositRequest; import bisq.core.trade.messages.PayDepositRequest;
import bisq.core.trade.messages.PayoutTxPublishedMessage; import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.protocol.tasks.CheckIfPeerIsBanned; import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.PublishTradeStatistics; import bisq.core.trade.protocol.tasks.PublishTradeStatistics;
import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness;
import bisq.core.trade.protocol.tasks.buyer.BuyerProcessPayoutTxPublishedMessage; import bisq.core.trade.protocol.tasks.buyer.BuyerProcessPayoutTxPublishedMessage;
@ -129,7 +129,7 @@ public class BuyerAsMakerProtocol extends TradeProtocol implements BuyerProtocol
}); });
taskRunner.addTasks( taskRunner.addTasks(
MakerProcessPayDepositRequest.class, MakerProcessPayDepositRequest.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
VerifyPeersAccountAgeWitness.class, VerifyPeersAccountAgeWitness.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
@ -186,7 +186,7 @@ public class BuyerAsMakerProtocol extends TradeProtocol implements BuyerProtocol
handleTaskRunnerFault(errorMessage); handleTaskRunnerFault(errorMessage);
}); });
taskRunner.addTasks( taskRunner.addTasks(
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
BuyerAsMakerSignPayoutTx.class, BuyerAsMakerSignPayoutTx.class,

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

@ -23,7 +23,7 @@ import bisq.core.trade.Trade;
import bisq.core.trade.messages.PayoutTxPublishedMessage; import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.messages.PublishDepositTxRequest; import bisq.core.trade.messages.PublishDepositTxRequest;
import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.protocol.tasks.CheckIfPeerIsBanned; import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.PublishTradeStatistics; import bisq.core.trade.protocol.tasks.PublishTradeStatistics;
import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness;
import bisq.core.trade.protocol.tasks.buyer.BuyerProcessPayoutTxPublishedMessage; import bisq.core.trade.protocol.tasks.buyer.BuyerProcessPayoutTxPublishedMessage;
@ -145,7 +145,7 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
errorMessage -> handleTaskRunnerFault(tradeMessage, errorMessage)); errorMessage -> handleTaskRunnerFault(tradeMessage, errorMessage));
taskRunner.addTasks( taskRunner.addTasks(
TakerProcessPublishDepositTxRequest.class, TakerProcessPublishDepositTxRequest.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
VerifyPeersAccountAgeWitness.class, VerifyPeersAccountAgeWitness.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
@ -179,7 +179,7 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
handleTaskRunnerFault(errorMessage); handleTaskRunnerFault(errorMessage);
}); });
taskRunner.addTasks( taskRunner.addTasks(
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
BuyerAsMakerSignPayoutTx.class, BuyerAsMakerSignPayoutTx.class,

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

@ -24,7 +24,7 @@ import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DepositTxPublishedMessage; import bisq.core.trade.messages.DepositTxPublishedMessage;
import bisq.core.trade.messages.PayDepositRequest; import bisq.core.trade.messages.PayDepositRequest;
import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.protocol.tasks.CheckIfPeerIsBanned; import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.PublishTradeStatistics; import bisq.core.trade.protocol.tasks.PublishTradeStatistics;
import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness;
import bisq.core.trade.protocol.tasks.maker.MakerCreateAndSignContract; import bisq.core.trade.protocol.tasks.maker.MakerCreateAndSignContract;
@ -125,7 +125,7 @@ public class SellerAsMakerProtocol extends TradeProtocol implements SellerProtoc
taskRunner.addTasks( taskRunner.addTasks(
MakerProcessPayDepositRequest.class, MakerProcessPayDepositRequest.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
VerifyPeersAccountAgeWitness.class, VerifyPeersAccountAgeWitness.class,
SellerVerifiesPeersAccountAge.class, SellerVerifiesPeersAccountAge.class,
@ -207,7 +207,7 @@ public class SellerAsMakerProtocol extends TradeProtocol implements SellerProtoc
}); });
taskRunner.addTasks( taskRunner.addTasks(
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
SellerSignAndFinalizePayoutTx.class, SellerSignAndFinalizePayoutTx.class,
@ -232,7 +232,7 @@ public class SellerAsMakerProtocol extends TradeProtocol implements SellerProtoc
}); });
taskRunner.addTasks( taskRunner.addTasks(
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
SellerSendPayoutTxPublishedMessage.class SellerSendPayoutTxPublishedMessage.class

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

@ -23,7 +23,7 @@ import bisq.core.trade.Trade;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage; import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.PublishDepositTxRequest; import bisq.core.trade.messages.PublishDepositTxRequest;
import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.protocol.tasks.CheckIfPeerIsBanned; import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.PublishTradeStatistics; import bisq.core.trade.protocol.tasks.PublishTradeStatistics;
import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness;
import bisq.core.trade.protocol.tasks.seller.SellerBroadcastPayoutTx; import bisq.core.trade.protocol.tasks.seller.SellerBroadcastPayoutTx;
@ -138,7 +138,7 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
taskRunner.addTasks( taskRunner.addTasks(
TakerProcessPublishDepositTxRequest.class, TakerProcessPublishDepositTxRequest.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
VerifyPeersAccountAgeWitness.class, VerifyPeersAccountAgeWitness.class,
SellerVerifiesPeersAccountAge.class, SellerVerifiesPeersAccountAge.class,
@ -194,7 +194,7 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
}); });
taskRunner.addTasks( taskRunner.addTasks(
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
SellerSignAndFinalizePayoutTx.class, SellerSignAndFinalizePayoutTx.class,
@ -219,7 +219,7 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
}); });
taskRunner.addTasks( taskRunner.addTasks(
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
SellerSendPayoutTxPublishedMessage.class SellerSendPayoutTxPublishedMessage.class

4
core/src/main/java/bisq/core/trade/protocol/tasks/CheckIfPeerIsBanned.java → core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java
View File

@ -30,9 +30,9 @@ import lombok.extern.slf4j.Slf4j;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@Slf4j @Slf4j
public class CheckIfPeerIsBanned extends TradeTask { public class ApplyFilter extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"}) @SuppressWarnings({"WeakerAccess", "unused"})
public CheckIfPeerIsBanned(TaskRunner taskHandler, Trade trade) { public ApplyFilter(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

18
desktop/src/main/java/bisq/desktop/main/debug/DebugView.java
View File

@ -26,7 +26,7 @@ import bisq.core.offer.availability.tasks.SendOfferAvailabilityRequest;
import bisq.core.offer.placeoffer.tasks.AddToOfferBook; import bisq.core.offer.placeoffer.tasks.AddToOfferBook;
import bisq.core.offer.placeoffer.tasks.CreateMakerFeeTx; import bisq.core.offer.placeoffer.tasks.CreateMakerFeeTx;
import bisq.core.offer.placeoffer.tasks.ValidateOffer; import bisq.core.offer.placeoffer.tasks.ValidateOffer;
import bisq.core.trade.protocol.tasks.CheckIfPeerIsBanned; import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.PublishTradeStatistics; import bisq.core.trade.protocol.tasks.PublishTradeStatistics;
import bisq.core.trade.protocol.tasks.buyer.BuyerSendCounterCurrencyTransferStartedMessage; import bisq.core.trade.protocol.tasks.buyer.BuyerSendCounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.tasks.buyer.BuyerSetupPayoutTxListener; import bisq.core.trade.protocol.tasks.buyer.BuyerSetupPayoutTxListener;
@ -107,7 +107,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
addGroup("BuyerAsMakerProtocol", addGroup("BuyerAsMakerProtocol",
FXCollections.observableArrayList(Arrays.asList( FXCollections.observableArrayList(Arrays.asList(
MakerProcessPayDepositRequest.class, MakerProcessPayDepositRequest.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
MakerCreateAndSignContract.class, MakerCreateAndSignContract.class,
@ -120,7 +120,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
PublishTradeStatistics.class, PublishTradeStatistics.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
BuyerAsMakerSignPayoutTx.class, BuyerAsMakerSignPayoutTx.class,
@ -137,7 +137,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
TakerSendPayDepositRequest.class, TakerSendPayDepositRequest.class,
TakerProcessPublishDepositTxRequest.class, TakerProcessPublishDepositTxRequest.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
TakerVerifyAndSignContract.class, TakerVerifyAndSignContract.class,
@ -148,7 +148,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
SellerSignAndFinalizePayoutTx.class, SellerSignAndFinalizePayoutTx.class,
@ -164,14 +164,14 @@ public class DebugView extends InitializableView<GridPane, Void> {
TakerSendPayDepositRequest.class, TakerSendPayDepositRequest.class,
TakerProcessPublishDepositTxRequest.class, TakerProcessPublishDepositTxRequest.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
TakerVerifyAndSignContract.class, TakerVerifyAndSignContract.class,
BuyerAsTakerSignAndPublishDepositTx.class, BuyerAsTakerSignAndPublishDepositTx.class,
TakerSendDepositTxPublishedMessage.class, TakerSendDepositTxPublishedMessage.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
TakerVerifyMakerAccount.class, TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class, TakerVerifyMakerFeePayment.class,
BuyerAsMakerSignPayoutTx.class, BuyerAsMakerSignPayoutTx.class,
@ -181,7 +181,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
addGroup("SellerAsMakerProtocol", addGroup("SellerAsMakerProtocol",
FXCollections.observableArrayList(Arrays.asList( FXCollections.observableArrayList(Arrays.asList(
MakerProcessPayDepositRequest.class, MakerProcessPayDepositRequest.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
MakerCreateAndSignContract.class, MakerCreateAndSignContract.class,
@ -198,7 +198,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
CheckIfPeerIsBanned.class, ApplyFilter.class,
MakerVerifyTakerAccount.class, MakerVerifyTakerAccount.class,
MakerVerifyTakerFeePayment.class, MakerVerifyTakerFeePayment.class,
SellerSignAndFinalizePayoutTx.class, SellerSignAndFinalizePayoutTx.class,