Refactor filter

common/src/main/java/bisq/common/proto/ProtoUtil.java

@@ -18,12 +18,15 @@
 package bisq.common.proto;
 
 import bisq.common.Proto;
+import bisq.common.util.CollectionUtils;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Message;
+import com.google.protobuf.ProtocolStringList;
 
 import com.google.common.base.Enums;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -95,4 +98,9 @@ public static <T extends Message> Iterable<T> collectionToProto(Collection<? ext
     public static <T> Iterable<T> collectionToProto(Collection<? extends Proto> collection, Function<? super Message, T> extra) {
         return collection.stream().map(o -> extra.apply(o.toProtoMessage())).collect(Collectors.toList());
     }
+
+    public static List<String> protocolStringListToList(ProtocolStringList protocolStringList) {
+        return CollectionUtils.isEmpty(protocolStringList) ? new ArrayList<>() : new ArrayList<>(protocolStringList);
+    }
+
 }

core/src/main/java/bisq/core/account/sign/SignedWitnessService.java

@@ -180,7 +180,7 @@ public boolean isSignedByArbitrator(AccountAgeWitness accountAgeWitness) {
     public boolean isFilteredWitness(AccountAgeWitness accountAgeWitness) {
         return getSignedWitnessSet(accountAgeWitness).stream()
                 .map(SignedWitness::getWitnessOwnerPubKey)
-                .anyMatch(ownerPubKey -> filterManager.isSignerPubKeyBanned(Utils.HEX.encode(ownerPubKey)));
+                .anyMatch(ownerPubKey -> filterManager.isWitnessSignerPubKeyBanned(Utils.HEX.encode(ownerPubKey)));
     }
 
     private byte[] ownerPubKey(AccountAgeWitness accountAgeWitness) {
@@ -442,7 +442,7 @@ private boolean isSignerAccountAgeWitness(AccountAgeWitness accountAgeWitness, l
     private boolean isValidSignerWitnessInternal(SignedWitness signedWitness,
                                                  long childSignedWitnessDateMillis,
                                                  Stack<P2PDataStorage.ByteArray> excludedPubKeys) {
-        if (filterManager.isSignerPubKeyBanned(Utils.HEX.encode(signedWitness.getWitnessOwnerPubKey()))) {
+        if (filterManager.isWitnessSignerPubKeyBanned(Utils.HEX.encode(signedWitness.getWitnessOwnerPubKey()))) {
             return false;
         }
         if (!verifySignature(signedWitness)) {

core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java

@@ -713,13 +713,13 @@ private boolean isNotFiltered(Dispute dispute) {
                 filterManager.isCurrencyBanned(dispute.getContract().getOfferPayload().getCurrencyCode()) ||
                 filterManager.isPaymentMethodBanned(
                         PaymentMethod.getPaymentMethodById(dispute.getContract().getPaymentMethodId())) ||
-                filterManager.isPeersPaymentAccountDataAreBanned(dispute.getContract().getBuyerPaymentAccountPayload(),
+                filterManager.arePeersPaymentAccountDataBanned(dispute.getContract().getBuyerPaymentAccountPayload(),
                         new PaymentAccountFilter[1]) ||
-                filterManager.isPeersPaymentAccountDataAreBanned(dispute.getContract().getSellerPaymentAccountPayload(),
+                filterManager.arePeersPaymentAccountDataBanned(dispute.getContract().getSellerPaymentAccountPayload(),
                         new PaymentAccountFilter[1]) ||
-                filterManager.isSignerPubKeyBanned(
+                filterManager.isWitnessSignerPubKeyBanned(
                         Utils.HEX.encode(dispute.getContract().getBuyerPubKeyRing().getSignaturePubKeyBytes())) ||
-                filterManager.isSignerPubKeyBanned(
+                filterManager.isWitnessSignerPubKeyBanned(
                         Utils.HEX.encode(dispute.getContract().getSellerPubKeyRing().getSignaturePubKeyBytes()));
         return !isFiltered;
     }