Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-10 15:40:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename clearXchange to zelle

Browse source
This commit is contained in:
woodser 2023-04-16 17:31:18 -04:00
parent 2afa5d761d
commit cffbfa8aaa
38 changed files with 160 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/haveno/core/api/model/PaymentAccountForm.java
View file

@ -64,7 +64,7 @@ public final class PaymentAccountForm implements PersistablePayload {
SEPA,
SEPA_INSTANT,
TRANSFERWISE,
CLEAR_X_CHANGE,
ZELLE,
SWIFT,
F2F,
STRIKE,

4
core/src/main/java/haveno/core/payment/PaymentAccountFactory.java
View file

@ -54,8 +54,8 @@ public class PaymentAccountFactory {
return new WeChatPayAccount();
case PaymentMethod.SWISH_ID:
return new SwishAccount();
case PaymentMethod.CLEAR_X_CHANGE_ID:
return new ClearXchangeAccount();
case PaymentMethod.ZELLE_ID:
return new ZelleAccount();
case PaymentMethod.CHASE_QUICK_PAY_ID:
return new ChaseQuickPayAccount();
case PaymentMethod.INTERAC_E_TRANSFER_ID:

6
core/src/main/java/haveno/core/payment/PaymentAccountUtil.java
View file

@ -51,7 +51,7 @@ import static haveno.core.payment.payload.PaymentMethod.CASH_BY_MAIL_ID;
import static haveno.core.payment.payload.PaymentMethod.CASH_DEPOSIT_ID;
import static haveno.core.payment.payload.PaymentMethod.CELPAY_ID;
import static haveno.core.payment.payload.PaymentMethod.CHASE_QUICK_PAY_ID;
import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID;
import static haveno.core.payment.payload.PaymentMethod.ZELLE_ID;
import static haveno.core.payment.payload.PaymentMethod.DOMESTIC_WIRE_TRANSFER_ID;
import static haveno.core.payment.payload.PaymentMethod.F2F_ID;
import static haveno.core.payment.payload.PaymentMethod.FASTER_PAYMENTS_ID;
@ -218,8 +218,8 @@ public class PaymentAccountUtil {
return JapanBankAccount.SUPPORTED_CURRENCIES;
case WECHAT_PAY_ID:
return WeChatPayAccount.SUPPORTED_CURRENCIES;
case CLEAR_X_CHANGE_ID:
return ClearXchangeAccount.SUPPORTED_CURRENCIES;
case ZELLE_ID:
return ZelleAccount.SUPPORTED_CURRENCIES;
case AUSTRALIA_PAYID_ID:
return AustraliaPayidAccount.SUPPORTED_CURRENCIES;
case PERFECT_MONEY_ID:

18
core/src/main/java/haveno/core/payment/ClearXchangeAccount.java → core/src/main/java/haveno/core/payment/ZelleAccount.java
View file

@ -20,7 +20,7 @@ package haveno.core.payment;
import haveno.core.api.model.PaymentAccountFormField;
import haveno.core.locale.FiatCurrency;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.payload.ClearXchangeAccountPayload;
import haveno.core.payment.payload.ZelleAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.payload.PaymentMethod;
import lombok.EqualsAndHashCode;
@ -29,12 +29,12 @@ import lombok.NonNull;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
public final class ClearXchangeAccount extends PaymentAccount {
public final class ZelleAccount extends PaymentAccount {
public static final List<TradeCurrency> SUPPORTED_CURRENCIES = List.of(new FiatCurrency("USD"));
public ClearXchangeAccount() {
super(PaymentMethod.CLEAR_X_CHANGE);
public ZelleAccount() {
super(PaymentMethod.ZELLE);
setSingleTradeCurrency(SUPPORTED_CURRENCIES.get(0));
}
@ -47,7 +47,7 @@ public final class ClearXchangeAccount extends PaymentAccount {
@Override
protected PaymentAccountPayload createPayload() {
return new ClearXchangeAccountPayload(paymentMethod.getId(), id);
return new ZelleAccountPayload(paymentMethod.getId(), id);
}
@Override
@ -61,18 +61,18 @@ public final class ClearXchangeAccount extends PaymentAccount {
}
public void setEmailOrMobileNr(String mobileNr) {
((ClearXchangeAccountPayload) paymentAccountPayload).setEmailOrMobileNr(mobileNr);
((ZelleAccountPayload) paymentAccountPayload).setEmailOrMobileNr(mobileNr);
}
public String getEmailOrMobileNr() {
return ((ClearXchangeAccountPayload) paymentAccountPayload).getEmailOrMobileNr();
return ((ZelleAccountPayload) paymentAccountPayload).getEmailOrMobileNr();
}
public void setHolderName(String holderName) {
((ClearXchangeAccountPayload) paymentAccountPayload).setHolderName(holderName);
((ZelleAccountPayload) paymentAccountPayload).setHolderName(holderName);
}
public String getHolderName() {
return ((ClearXchangeAccountPayload) paymentAccountPayload).getHolderName();
return ((ZelleAccountPayload) paymentAccountPayload).getHolderName();
}
}

16
core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
View file

@ -34,7 +34,7 @@ import haveno.core.payment.CapitualAccount;
import haveno.core.payment.CashByMailAccount;
import haveno.core.payment.CashDepositAccount;
import haveno.core.payment.CelPayAccount;
import haveno.core.payment.ClearXchangeAccount;
import haveno.core.payment.ZelleAccount;
import haveno.core.payment.DomesticWireTransferAccount;
import haveno.core.payment.F2FAccount;
import haveno.core.payment.FasterPaymentsAccount;
@ -132,7 +132,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
public static final String SWISH_ID = "SWISH";
public static final String ALI_PAY_ID = "ALI_PAY";
public static final String WECHAT_PAY_ID = "WECHAT_PAY";
public static final String CLEAR_X_CHANGE_ID = "CLEAR_X_CHANGE";
public static final String ZELLE_ID = "ZELLE";
@Deprecated
public static final String CHASE_QUICK_PAY_ID = "CHASE_QUICK_PAY"; // Removed due to QuickPay becoming Zelle
@ -197,7 +197,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
public static PaymentMethod SWISH;
public static PaymentMethod ALI_PAY;
public static PaymentMethod WECHAT_PAY;
public static PaymentMethod CLEAR_X_CHANGE;
public static PaymentMethod ZELLE;
public static PaymentMethod CHASE_QUICK_PAY;
public static PaymentMethod INTERAC_E_TRANSFER;
public static PaymentMethod US_POSTAL_MONEY_ORDER;
@ -260,7 +260,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
SWISH = new PaymentMethod(SWISH_ID, DAY, DEFAULT_TRADE_LIMIT_LOW_RISK, getAssetCodes(SwishAccount.SUPPORTED_CURRENCIES)),
// US
CLEAR_X_CHANGE = new PaymentMethod(CLEAR_X_CHANGE_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(ClearXchangeAccount.SUPPORTED_CURRENCIES)),
ZELLE = new PaymentMethod(ZELLE_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(ZelleAccount.SUPPORTED_CURRENCIES)),
POPMONEY = new PaymentMethod(POPMONEY_ID, DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(PopmoneyAccount.SUPPORTED_CURRENCIES)),
US_POSTAL_MONEY_ORDER = new PaymentMethod(US_POSTAL_MONEY_ORDER_ID, 8 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(USPostalMoneyOrderAccount.SUPPORTED_CURRENCIES)),
@ -334,7 +334,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
SEPA_ID,
SEPA_INSTANT_ID,
TRANSFERWISE_ID,
CLEAR_X_CHANGE_ID,
ZELLE_ID,
SWIFT_ID,
F2F_ID,
STRIKE_ID,
@ -352,10 +352,10 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
static {
paymentMethods.sort((o1, o2) -> {
String id1 = o1.getId();
if (id1.equals(CLEAR_X_CHANGE_ID))
if (id1.equals(ZELLE_ID))
id1 = "ZELLE";
String id2 = o2.getId();
if (id2.equals(CLEAR_X_CHANGE_ID))
if (id2.equals(ZELLE_ID))
id2 = "ZELLE";
return id1.compareTo(id2);
});
@ -549,7 +549,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
return id.equals(PaymentMethod.SEPA_ID) ||
id.equals(PaymentMethod.SEPA_INSTANT_ID) ||
id.equals(PaymentMethod.INTERAC_E_TRANSFER_ID) ||
id.equals(PaymentMethod.CLEAR_X_CHANGE_ID) ||
id.equals(PaymentMethod.ZELLE_ID) ||
id.equals(PaymentMethod.REVOLUT_ID) ||
id.equals(PaymentMethod.NATIONAL_BANK_ID) ||
id.equals(PaymentMethod.SAME_BANK_ID) ||

16
core/src/main/java/haveno/core/payment/payload/ClearXchangeAccountPayload.java → core/src/main/java/haveno/core/payment/payload/ZelleAccountPayload.java
View file

@ -34,11 +34,11 @@ import java.util.Map;
@Setter
@Getter
@Slf4j
public final class ClearXchangeAccountPayload extends PaymentAccountPayload implements PayloadWithHolderName {
public final class ZelleAccountPayload extends PaymentAccountPayload implements PayloadWithHolderName {
private String emailOrMobileNr = "";
private String holderName = "";
public ClearXchangeAccountPayload(String paymentMethod, String id) {
public ZelleAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id);
}
@ -47,7 +47,7 @@ public final class ClearXchangeAccountPayload extends PaymentAccountPayload impl
// PROTO BUFFER
///////////////////////////////////////////////////////////////////////////////////////////
private ClearXchangeAccountPayload(String paymentMethod,
private ZelleAccountPayload(String paymentMethod,
String id,
String emailOrMobileNr,
String holderName,
@ -65,17 +65,17 @@ public final class ClearXchangeAccountPayload extends PaymentAccountPayload impl
@Override
public Message toProtoMessage() {
return getPaymentAccountPayloadBuilder()
.setClearXchangeAccountPayload(protobuf.ClearXchangeAccountPayload.newBuilder()
.setZelleAccountPayload(protobuf.ZelleAccountPayload.newBuilder()
.setEmailOrMobileNr(emailOrMobileNr)
.setHolderName(holderName))
.build();
}
public static ClearXchangeAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
return new ClearXchangeAccountPayload(proto.getPaymentMethodId(),
public static ZelleAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
return new ZelleAccountPayload(proto.getPaymentMethodId(),
proto.getId(),
proto.getClearXchangeAccountPayload().getEmailOrMobileNr(),
proto.getClearXchangeAccountPayload().getHolderName(),
proto.getZelleAccountPayload().getEmailOrMobileNr(),
proto.getZelleAccountPayload().getHolderName(),
proto.getMaxTradePeriod(),
new HashMap<>(proto.getExcludeFromJsonDataMap()));
}

6
core/src/main/java/haveno/core/proto/CoreProtoResolver.java
View file

@ -34,7 +34,7 @@ import haveno.core.payment.payload.CashByMailAccountPayload;
import haveno.core.payment.payload.CashDepositAccountPayload;
import haveno.core.payment.payload.CelPayAccountPayload;
import haveno.core.payment.payload.ChaseQuickPayAccountPayload;
import haveno.core.payment.payload.ClearXchangeAccountPayload;
import haveno.core.payment.payload.ZelleAccountPayload;
import haveno.core.payment.payload.CryptoCurrencyAccountPayload;
import haveno.core.payment.payload.DomesticWireTransferAccountPayload;
import haveno.core.payment.payload.F2FAccountPayload;
@ -101,8 +101,8 @@ public class CoreProtoResolver implements ProtoResolver {
return WeChatPayAccountPayload.fromProto(proto);
case CHASE_QUICK_PAY_ACCOUNT_PAYLOAD:
return ChaseQuickPayAccountPayload.fromProto(proto);
case CLEAR_XCHANGE_ACCOUNT_PAYLOAD:
return ClearXchangeAccountPayload.fromProto(proto);
case ZELLE_ACCOUNT_PAYLOAD:
return ZelleAccountPayload.fromProto(proto);
case COUNTRY_BASED_PAYMENT_ACCOUNT_PAYLOAD:
final protobuf.CountryBasedPaymentAccountPayload.MessageCase messageCaseCountry = proto.getCountryBasedPaymentAccountPayload().getMessageCase();
switch (messageCaseCountry) {

2
core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java
View file

@ -121,7 +121,7 @@ public final class TradeStatistics3 implements ProcessOncePersistableNetworkPayl
SWISH,
ALI_PAY,
WECHAT_PAY,
CLEAR_X_CHANGE,
ZELLE,
CHASE_QUICK_PAY,
INTERAC_E_TRANSFER,
US_POSTAL_MONEY_ORDER,