+ * An instance of this class can write new payment account forms (editable json files), + * and de-serialize edited json files into {@link bisq.core.payment.PaymentAccount} + * instances. + *
+ *+ * Example use case: (1) ask for a blank Hal Cash account form, (2) edit it, (3) derive a + * {@link bisq.core.payment.HalCashAccount} instance from the edited json file. + *
+ *+ * (1) Ask for a hal cash account form: Pass a {@link bisq.core.payment.payload.PaymentMethod#HAL_CASH_ID} + * to {@link bisq.core.api.model.PaymentAccountForm#getPaymentAccountForm(String)} to + * get the json Hal Cash payment account form: + *
+ * {
+ * "_COMMENT_": "Please do not edit the paymentMethodId field.",
+ * "paymentMethodId": "HAL_CASH",
+ * "accountName": "Your accountname",
+ * "mobileNr": "Your mobilenr"
+ * }
+ *
+ *
+ * + * (2) Save the Hal Cash payment account form to disk, and edit it: + *
+ * {
+ * "_COMMENT_": "Please do not edit the paymentMethodId field.",
+ * "paymentMethodId": "HAL_CASH",
+ * "accountName": "Hal Cash Acct",
+ * "mobileNr": "798 123 456"
+ * }
+ *
+ *
+ * (3) De-serialize the edited json account form: Pass the edited json file to
+ * {@link bisq.core.api.model.PaymentAccountForm#toPaymentAccount(File)},
+ * and get a {@link bisq.core.payment.HalCashAccount} instance.
+ * + * PaymentAccount( + * paymentMethod=PaymentMethod(id=HAL_CASH, + * maxTradePeriod=86400000, + * maxTradeLimit=50000000), + * id=e33c9d94-1a1a-43fd-aa11-fcaacbb46100, + * creationDate=Mon Nov 16 12:26:43 BRST 2020, + * paymentAccountPayload=HalCashAccountPayload(mobileNr=798 123 456), + * accountName=Hal Cash Acct, + * tradeCurrencies=[FiatCurrency(currency=EUR)], + * selectedTradeCurrency=FiatCurrency(currency=EUR) + * ) + *+ */ +@Singleton +@Slf4j +public class PaymentAccountForm { + + private final GsonBuilder gsonBuilder = new GsonBuilder() + .setPrettyPrinting() + .serializeNulls(); + + // Names of PaymentAccount fields to exclude from json forms. + private final String[] excludedFields = new String[]{ + "log", + "id", + "acceptedCountryCodes", + "countryCode", + "creationDate", + "excludeFromJsonDataMap", + "maxTradePeriod", + "paymentAccountPayload", + "paymentMethod", + "paymentMethodId", + "selectedTradeCurrency", + "tradeCurrencies", + "HOLDER_NAME", + "SALT" + }; + + /** + * Returns a blank payment account form (json) for the given paymentMethodId. + * + * @param paymentMethodId Determines what kind of json form to return. + * @return A uniquely named tmp file used to define new payment account details. + */ + public File getPaymentAccountForm(String paymentMethodId) { + PaymentMethod paymentMethod = getPaymentMethodById(paymentMethodId); + File file = getTmpJsonFile(paymentMethodId); + try (OutputStreamWriter outputStreamWriter = new OutputStreamWriter(new FileOutputStream(checkNotNull(file), false), UTF_8)) { + PaymentAccount paymentAccount = PaymentAccountFactory.getPaymentAccount(paymentMethod); + Class clazz = paymentAccount.getClass(); + Gson gson = gsonBuilder.registerTypeAdapter(clazz, new PaymentAccountTypeAdapter(clazz, excludedFields)).create(); + String json = gson.toJson(paymentAccount); // serializes target to json + outputStreamWriter.write(json); + } catch (Exception ex) { + log.error(format("Could not export json file for a %s account.", paymentMethod.getShortName()), ex); + } + return file; + } + + /** + * De-serialize a PaymentAccount json form into a populated PaymentAccount instance. + * + * @param jsonForm The file representing a new payment account form. + * @return A populated PaymentAccount subclass instance. + */ + public PaymentAccount toPaymentAccount(File jsonForm) { + String json = toJsonString(jsonForm); + Class clazz = getPaymentAccountClassFromJson(json); + Gson gson = gsonBuilder.registerTypeAdapter(clazz, new PaymentAccountTypeAdapter(clazz)).create(); + return gson.fromJson(json, clazz); + } + + public String toJsonString(File jsonFile) { + try { + checkNotNull(jsonFile, "json file cannot be null"); + return new String(Files.readAllBytes(Paths.get(jsonFile.getAbsolutePath()))); + } catch (IOException ex) { + throw new IllegalStateException(format("Could not read content from file '%s'", + jsonFile.getAbsolutePath()), ex); + } + } + + public URI getClickableURI(File jsonForm) { + try { + return new URI("file", + "", + jsonForm.toURI().getPath(), + null, + null); + } catch (URISyntaxException ex) { + throw new IllegalArgumentException("", ex); + } + } + + @VisibleForTesting + public static File getTmpJsonFile(String paymentMethodId) { + File file = null; + try { + // Creates a tmp file that includes a random number string between the + // prefix and suffix, i.e., sepa_form_13243546575879.json, so there is + // little chance this will fail because the tmp file already exists. + file = File.createTempFile(paymentMethodId.toLowerCase() + "_form_", + ".json", + Paths.get(getProperty("java.io.tmpdir")).toFile()); + } catch (IOException ex) { + log.error("", ex); + } + return file; + } + + private Class getPaymentAccountClassFromJson(String json) { + Map
* PaymentAccount(
@@ -152,16 +153,27 @@ public File getPaymentAccountForm(String paymentMethodId) {
}
/**
- * De-serialize a PaymentAccount json form into a populated PaymentAccount instance.
+ * De-serialize a PaymentAccount json form into a new PaymentAccount instance.
*
* @param jsonForm The file representing a new payment account form.
* @return A populated PaymentAccount subclass instance.
*/
+ @VisibleForTesting
public PaymentAccount toPaymentAccount(File jsonForm) {
- String json = toJsonString(jsonForm);
- Class clazz = getPaymentAccountClassFromJson(json);
+ String jsonString = toJsonString(jsonForm);
+ return toPaymentAccount(jsonString);
+ }
+
+ /**
+ * De-serialize a PaymentAccount json string into a new PaymentAccount instance.
+ *
+ * @param jsonString The json data representing a new payment account form.
+ * @return A populated PaymentAccount subclass instance.
+ */
+ public PaymentAccount toPaymentAccount(String jsonString) {
+ Class clazz = getPaymentAccountClassFromJson(jsonString);
Gson gson = gsonBuilder.registerTypeAdapter(clazz, new PaymentAccountTypeAdapter(clazz)).create();
- return gson.fromJson(json, clazz);
+ return gson.fromJson(jsonString, clazz);
}
public String toJsonString(File jsonFile) {
@@ -174,6 +186,7 @@ public String toJsonString(File jsonFile) {
}
}
+ @VisibleForTesting
public URI getClickableURI(File jsonForm) {
try {
return new URI("file",
diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java b/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java
index 35bb3b322bb..d48499c85ff 100644
--- a/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java
+++ b/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java
@@ -50,11 +50,10 @@ public GrpcPaymentAccountsService(CoreApi coreApi) {
@Override
public void createPaymentAccount(CreatePaymentAccountRequest req,
StreamObserver responseObserver) {
- coreApi.createPaymentAccount(req.getPaymentMethodId(),
- req.getAccountName(),
- req.getAccountNumber(),
- req.getCurrencyCode());
- var reply = CreatePaymentAccountReply.newBuilder().build();
+ PaymentAccount paymentAccount = coreApi.createPaymentAccount(req.getPaymentAccountForm());
+ var reply = CreatePaymentAccountReply.newBuilder()
+ .setPaymentAccount(paymentAccount.toProtoMessage())
+ .build();
responseObserver.onNext(reply);
responseObserver.onCompleted();
}
diff --git a/proto/src/main/proto/grpc.proto b/proto/src/main/proto/grpc.proto
index 0f5430b429b..b20a508ddea 100644
--- a/proto/src/main/proto/grpc.proto
+++ b/proto/src/main/proto/grpc.proto
@@ -132,14 +132,11 @@ service PaymentAccounts {
}
message CreatePaymentAccountRequest {
- string paymentMethodId = 1;
- string accountName = 2;
- string accountNumber = 3;
- // TODO Support all currencies. Maybe add a repeated and if only one is used its a singletonList.
- string currencyCode = 4;
+ string paymentAccountForm = 1;
}
message CreatePaymentAccountReply {
+ PaymentAccount paymentAccount = 1;
}
message GetPaymentAccountsRequest {
From 138822edadea4e2a04ad0292f5016e5bdccf06ac Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Wed, 18 Nov 2020 20:05:15 -0300
Subject: [PATCH 36/52] Avoid 'unnecessary use of fully qualified name' codacy
issue
---
apitest/src/test/java/bisq/apitest/method/MethodTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apitest/src/test/java/bisq/apitest/method/MethodTest.java b/apitest/src/test/java/bisq/apitest/method/MethodTest.java
index 0187306b103..03cb6cb0b3c 100644
--- a/apitest/src/test/java/bisq/apitest/method/MethodTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/MethodTest.java
@@ -365,7 +365,7 @@ protected static void registerDisputeAgents(BisqAppConfig bisqAppConfig) {
disputeAgentsService.registerDisputeAgent(createRegisterDisputeAgentRequest(REFUND_AGENT));
}
- private bisq.core.payment.PaymentAccount fromProto(protobuf.PaymentAccount proto) {
+ private bisq.core.payment.PaymentAccount fromProto(PaymentAccount proto) {
return bisq.core.payment.PaymentAccount.fromProto(proto, CORE_PROTO_RESOLVER);
}
}
From cb9a68bae197459e7b2dc7a8de1f9e4fa6944394 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Thu, 19 Nov 2020 12:01:41 -0300
Subject: [PATCH 37/52] Tidy up payment accts api related msgs on CLI
---
cli/src/main/java/bisq/cli/CliMain.java | 26 +++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/bisq/cli/CliMain.java
index 6439510266e..f3d2b806ada 100644
--- a/cli/src/main/java/bisq/cli/CliMain.java
+++ b/cli/src/main/java/bisq/cli/CliMain.java
@@ -43,6 +43,8 @@
import bisq.proto.grpc.UnlockWalletRequest;
import bisq.proto.grpc.WithdrawFundsRequest;
+import protobuf.PaymentAccount;
+
import io.grpc.StatusRuntimeException;
import joptsimple.OptionParser;
@@ -52,6 +54,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintStream;
@@ -443,10 +446,12 @@ public static void run(String[] args) {
.build();
String jsonString = paymentAccountsService.getPaymentAccountForm(request)
.getPaymentAccountFormJson();
- out.printf("new payment account form: %s%n", jsonString);
- saveFileToDisk(paymentMethodId.toLowerCase(),
+ File jsonFile = saveFileToDisk(paymentMethodId.toLowerCase(),
".json",
jsonString);
+ out.printf("Payment account form %s%nsaved to %s%n",
+ jsonString, jsonFile.getAbsolutePath());
+ out.println("Edit the file, and use as the argument to a 'createpaymentacct' command.");
return;
}
case createpaymentacct: {
@@ -457,7 +462,8 @@ public static void run(String[] args) {
var paymentAccountFormPath = Paths.get(nonOptionArgs.get(1));
if (!paymentAccountFormPath.toFile().exists())
throw new IllegalStateException(
- format("%s could not be found", paymentAccountFormPath.toString()));
+ format("payment account form '%s' could not be found",
+ paymentAccountFormPath.toString()));
String jsonString;
try {
@@ -470,14 +476,21 @@ public static void run(String[] args) {
var request = CreatePaymentAccountRequest.newBuilder()
.setPaymentAccountForm(jsonString)
.build();
- paymentAccountsService.createPaymentAccount(request);
+ var reply = paymentAccountsService.createPaymentAccount(request);
out.println("payment account saved");
+ out.println(formatPaymentAcctTbl(singletonList(reply.getPaymentAccount())));
return;
}
case getpaymentaccts: {
var request = GetPaymentAccountsRequest.newBuilder().build();
var reply = paymentAccountsService.getPaymentAccounts(request);
- out.println(formatPaymentAcctTbl(reply.getPaymentAccountsList()));
+
+ List paymentAccounts = reply.getPaymentAccountsList();
+ if (paymentAccounts.size() > 0)
+ out.println(formatPaymentAcctTbl(paymentAccounts));
+ else
+ out.println("no payment accounts are saved");
+
return;
}
case lockwallet: {
@@ -560,7 +573,7 @@ private static Method getMethodFromCmd(String methodName) {
return Method.valueOf(methodName.toLowerCase());
}
- private static void saveFileToDisk(String prefix,
+ private static File saveFileToDisk(String prefix,
@SuppressWarnings("SameParameterValue") String suffix,
String text) {
String timestamp = Long.toUnsignedString(new Date().getTime());
@@ -571,6 +584,7 @@ private static void saveFileToDisk(String prefix,
try (PrintWriter out = new PrintWriter(path.toString())) {
out.println(text);
}
+ return path.toAbsolutePath().toFile();
} else {
throw new IllegalStateException(format("could not overwrite existing file '%s'", relativeFileName));
}
From ff887eb3392f62b4502fa3fdc595aa600b15d7cc Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Thu, 19 Nov 2020 13:38:34 -0300
Subject: [PATCH 38/52] Fix createpaymentacct validation problems
- Add missing boilerplate error handling to GrpcPaymentAccountsService.
- Edit some PaymentAccountForm & PaymentAccountTypeAdapter exception
messages that would be passed to CLI; they should be in the same
style as existing CLI err msgs.
---
.../core/api/model/PaymentAccountForm.java | 9 +-
.../api/model/PaymentAccountTypeAdapter.java | 61 ++++++------
.../grpc/GrpcPaymentAccountsService.java | 94 ++++++++++++++-----
3 files changed, 106 insertions(+), 58 deletions(-)
diff --git a/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java b/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java
index 3906c97a236..5742de2cb3a 100644
--- a/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java
+++ b/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java
@@ -147,7 +147,9 @@ public File getPaymentAccountForm(String paymentMethodId) {
String json = gson.toJson(paymentAccount); // serializes target to json
outputStreamWriter.write(json);
} catch (Exception ex) {
- log.error(format("Could not export json file for a %s account.", paymentMethod.getShortName()), ex);
+ log.error(format("Could not write json file for a %s account.", paymentMethodId), ex);
+ throw new IllegalStateException(
+ format("cannot create a payment account form for a %s payment method", paymentMethodId));
}
return file;
}
@@ -158,6 +160,7 @@ public File getPaymentAccountForm(String paymentMethodId) {
* @param jsonForm The file representing a new payment account form.
* @return A populated PaymentAccount subclass instance.
*/
+ @SuppressWarnings("unused")
@VisibleForTesting
public PaymentAccount toPaymentAccount(File jsonForm) {
String jsonString = toJsonString(jsonForm);
@@ -181,7 +184,7 @@ public String toJsonString(File jsonFile) {
checkNotNull(jsonFile, "json file cannot be null");
return new String(Files.readAllBytes(Paths.get(jsonFile.getAbsolutePath())));
} catch (IOException ex) {
- throw new IllegalStateException(format("Could not read content from file '%s'",
+ throw new IllegalStateException(format("cannot read content of file '%s'",
jsonFile.getAbsolutePath()), ex);
}
}
@@ -218,7 +221,7 @@ public static File getTmpJsonFile(String paymentMethodId) {
private Class getPaymentAccountClassFromJson(String json) {
Map jsonMap = gsonBuilder.create().fromJson(json, (Type) Object.class);
String paymentMethodId = checkNotNull((String) jsonMap.get("paymentMethodId"),
- format("Could not find a paymentMethodId in the json string: %s", json));
+ format("cannot not find a paymentMethodId in json string: %s", json));
return getPaymentAccountClass(paymentMethodId);
}
diff --git a/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java b/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
index 151a4e0e782..fe5e81035a7 100644
--- a/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
+++ b/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
@@ -116,7 +116,7 @@ public void write(JsonWriter out, PaymentAccount account) throws IOException {
}
} catch (Exception ex) {
throw new IllegalStateException(
- format("Could not serialize a %s to json", account.getClass().getSimpleName()), ex);
+ format("cannot not serialize a %s", account.getClass().getSimpleName()), ex);
}
});
out.endObject();
@@ -144,21 +144,16 @@ public PaymentAccount read(JsonReader in) throws IOException {
if (didReadCountryField(in, account, currentFieldName))
continue;
- try {
- Optional field = fieldSettersMap.keySet().stream()
- .filter(k -> k.getName().equals(currentFieldName)).findFirst();
-
- field.ifPresentOrElse((f) -> invokeSetterMethod(account, f, in), () -> {
- throw new IllegalStateException(
- format("Could not de-serialize json to a '%s' because there is no %s field.",
- account.getClass().getSimpleName(),
- currentFieldName));
- });
- } catch (Exception ex) {
+ Optional field = fieldSettersMap.keySet().stream()
+ .filter(k -> k.getName().equals(currentFieldName)).findFirst();
+
+ field.ifPresentOrElse((f) -> invokeSetterMethod(account, f, in), () -> {
throw new IllegalStateException(
- format("Could not de-serialize json to a '%s'.",
- account.getClass().getSimpleName()), ex);
- }
+ format("programmer error: cannot de-serialize json to a '%s' "
+ + " because there is no %s field.",
+ account.getClass().getSimpleName(),
+ currentFieldName));
+ });
}
in.endObject();
if (log.isDebugEnabled())
@@ -178,19 +173,20 @@ private void invokeSetterMethod(PaymentAccount account, Field field, JsonReader
} else if (isSetterOnPaymentAccountPayloadClass(setter.get(), account)) {
setter.get().invoke(account.getPaymentAccountPayload(), nextStringOrNull(jsonReader));
} else {
- String exMsg = format("Could not de-serialize json to a '%s' using reflection"
- + " because the setter's declaring class was not found.",
+ String exMsg = format("programmer error: cannot de-serialize json to a '%s' using reflection"
+ + " because the setter method's declaring class was not found.",
account.getClass().getSimpleName());
throw new IllegalStateException(exMsg);
}
} catch (IllegalAccessException | InvocationTargetException ex) {
throw new IllegalStateException(
- format("Could not de-serialize json to a '%s' due to reflection error.",
+ format("programmer error: cannot de-serialize json to a '%s' due to reflection error.",
account.getClass().getSimpleName()), ex);
}
} else {
throw new IllegalStateException(
- format("Could not de-serialize json to a '%s' because there is no setter for field %s.",
+ format("programmer error: cannot de-serialize json to a '%s' "
+ + " because there is no setter method for field %s.",
account.getClass().getSimpleName(),
field.getName()));
}
@@ -233,7 +229,9 @@ private String nextStringOrNull(JsonReader in) {
return in.nextString();
}
} catch (IOException ex) {
- throw new IllegalStateException("Could not peek at next String value in JsonReader.", ex);
+ throw new IllegalStateException(
+ "programmer error: cannot not peek at next string value in json reader.",
+ ex);
}
}
@@ -247,7 +245,9 @@ private Long nextLongOrNull(JsonReader in) {
return in.nextLong();
}
} catch (IOException ex) {
- throw new IllegalStateException("Could not peek at next Long value in JsonReader.", ex);
+ throw new IllegalStateException(
+ "programmer error: cannot not peek at next long value in json reader.",
+ ex);
}
}
@@ -290,9 +290,8 @@ private boolean didReadCountryField(JsonReader in, PaymentAccount account, Strin
account.setSingleTradeCurrency(fiatCurrency);
return true;
} else {
- throw new IllegalStateException(
- format("Could not de-serialize json to a '%s' because %s is an invalid country code.",
- account.getClass().getSimpleName(), countryCode));
+ throw new IllegalArgumentException(
+ format("'%s' is an invalid country code.", countryCode));
}
} else {
return false;
@@ -307,7 +306,7 @@ private Class getPaymentAccountPayloadType() {
+ "." + paymentAccountType.getSimpleName() + "Payload");
} catch (Exception ex) {
throw new IllegalStateException(
- format("Could not get payload class for %s",
+ format("programmer error: cannot get payload class for %s",
paymentAccountType.getSimpleName()), ex);
}
}
@@ -319,11 +318,15 @@ private PaymentAccount initNewPaymentAccount() {
paymentAccount.init();
return paymentAccount;
} catch (NoSuchMethodException ex) {
- throw new IllegalStateException(format("No default declared constructor found for class %s",
- paymentAccountType.getSimpleName()), ex);
+ throw new IllegalStateException(
+ format("programmer error: no default declared constructor found for class %s",
+ paymentAccountType.getSimpleName()),
+ ex);
} catch (IllegalAccessException | InstantiationException | InvocationTargetException ex) {
- throw new IllegalStateException(format("Could not instantiate class %s",
- paymentAccountType.getSimpleName()), ex);
+ throw new IllegalStateException(
+ format("programmer error: cannot instantiate class %s",
+ paymentAccountType.getSimpleName()),
+ ex);
}
}
}
diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java b/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java
index d48499c85ff..0438d33655d 100644
--- a/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java
+++ b/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java
@@ -31,6 +31,8 @@
import bisq.proto.grpc.GetPaymentMethodsRequest;
import bisq.proto.grpc.PaymentAccountsGrpc;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
import io.grpc.stub.StreamObserver;
import javax.inject.Inject;
@@ -50,46 +52,86 @@ public GrpcPaymentAccountsService(CoreApi coreApi) {
@Override
public void createPaymentAccount(CreatePaymentAccountRequest req,
StreamObserver responseObserver) {
- PaymentAccount paymentAccount = coreApi.createPaymentAccount(req.getPaymentAccountForm());
- var reply = CreatePaymentAccountReply.newBuilder()
- .setPaymentAccount(paymentAccount.toProtoMessage())
- .build();
- responseObserver.onNext(reply);
- responseObserver.onCompleted();
+ try {
+ PaymentAccount paymentAccount = coreApi.createPaymentAccount(req.getPaymentAccountForm());
+ var reply = CreatePaymentAccountReply.newBuilder()
+ .setPaymentAccount(paymentAccount.toProtoMessage())
+ .build();
+ responseObserver.onNext(reply);
+ responseObserver.onCompleted();
+ } catch (IllegalArgumentException cause) {
+ var ex = new StatusRuntimeException(Status.INVALID_ARGUMENT.withDescription(cause.getMessage()));
+ responseObserver.onError(ex);
+ throw ex;
+ } catch (IllegalStateException cause) {
+ var ex = new StatusRuntimeException(Status.UNKNOWN.withDescription(cause.getMessage()));
+ responseObserver.onError(ex);
+ throw ex;
+ }
}
@Override
public void getPaymentAccounts(GetPaymentAccountsRequest req,
StreamObserver responseObserver) {
- var paymentAccounts = coreApi.getPaymentAccounts().stream()
- .map(PaymentAccount::toProtoMessage)
- .collect(Collectors.toList());
- var reply = GetPaymentAccountsReply.newBuilder()
- .addAllPaymentAccounts(paymentAccounts).build();
- responseObserver.onNext(reply);
- responseObserver.onCompleted();
+ try {
+ var paymentAccounts = coreApi.getPaymentAccounts().stream()
+ .map(PaymentAccount::toProtoMessage)
+ .collect(Collectors.toList());
+ var reply = GetPaymentAccountsReply.newBuilder()
+ .addAllPaymentAccounts(paymentAccounts).build();
+ responseObserver.onNext(reply);
+ responseObserver.onCompleted();
+ } catch (IllegalArgumentException cause) {
+ var ex = new StatusRuntimeException(Status.INVALID_ARGUMENT.withDescription(cause.getMessage()));
+ responseObserver.onError(ex);
+ throw ex;
+ } catch (IllegalStateException cause) {
+ var ex = new StatusRuntimeException(Status.UNKNOWN.withDescription(cause.getMessage()));
+ responseObserver.onError(ex);
+ throw ex;
+ }
}
@Override
public void getPaymentMethods(GetPaymentMethodsRequest req,
StreamObserver responseObserver) {
- var paymentMethods = coreApi.getFiatPaymentMethods().stream()
- .map(PaymentMethod::toProtoMessage)
- .collect(Collectors.toList());
- var reply = GetPaymentMethodsReply.newBuilder()
- .addAllPaymentMethods(paymentMethods).build();
- responseObserver.onNext(reply);
- responseObserver.onCompleted();
+ try {
+ var paymentMethods = coreApi.getFiatPaymentMethods().stream()
+ .map(PaymentMethod::toProtoMessage)
+ .collect(Collectors.toList());
+ var reply = GetPaymentMethodsReply.newBuilder()
+ .addAllPaymentMethods(paymentMethods).build();
+ responseObserver.onNext(reply);
+ responseObserver.onCompleted();
+ } catch (IllegalArgumentException cause) {
+ var ex = new StatusRuntimeException(Status.INVALID_ARGUMENT.withDescription(cause.getMessage()));
+ responseObserver.onError(ex);
+ throw ex;
+ } catch (IllegalStateException cause) {
+ var ex = new StatusRuntimeException(Status.UNKNOWN.withDescription(cause.getMessage()));
+ responseObserver.onError(ex);
+ throw ex;
+ }
}
@Override
public void getPaymentAccountForm(GetPaymentAccountFormRequest req,
StreamObserver responseObserver) {
- var paymentAccountFormJson = coreApi.getPaymentAccountForm(req.getPaymentMethodId());
- var reply = GetPaymentAccountFormReply.newBuilder()
- .setPaymentAccountFormJson(paymentAccountFormJson)
- .build();
- responseObserver.onNext(reply);
- responseObserver.onCompleted();
+ try {
+ var paymentAccountFormJson = coreApi.getPaymentAccountForm(req.getPaymentMethodId());
+ var reply = GetPaymentAccountFormReply.newBuilder()
+ .setPaymentAccountFormJson(paymentAccountFormJson)
+ .build();
+ responseObserver.onNext(reply);
+ responseObserver.onCompleted();
+ } catch (IllegalArgumentException cause) {
+ var ex = new StatusRuntimeException(Status.INVALID_ARGUMENT.withDescription(cause.getMessage()));
+ responseObserver.onError(ex);
+ throw ex;
+ } catch (IllegalStateException cause) {
+ var ex = new StatusRuntimeException(Status.UNKNOWN.withDescription(cause.getMessage()));
+ responseObserver.onError(ex);
+ throw ex;
+ }
}
}
From 58f1af6f45530c17827f2694ab237ba07b1719fd Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Fri, 20 Nov 2020 12:00:22 -0300
Subject: [PATCH 39/52] Log server stack traces, pass concise err msgs to CLI
For exceptions caught in the server, we want to log a reason and a
full stack trace, then send less verbose exception msgs up to the CLI.
---
.../core/api/model/PaymentAccountForm.java | 30 ++++++----
.../api/model/PaymentAccountTypeAdapter.java | 58 ++++++++++---------
2 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java b/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java
index 5742de2cb3a..b82656b4330 100644
--- a/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java
+++ b/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java
@@ -28,6 +28,8 @@
import com.google.common.annotations.VisibleForTesting;
+import org.apache.commons.lang3.StringUtils;
+
import java.net.URI;
import java.net.URISyntaxException;
@@ -147,9 +149,9 @@ public File getPaymentAccountForm(String paymentMethodId) {
String json = gson.toJson(paymentAccount); // serializes target to json
outputStreamWriter.write(json);
} catch (Exception ex) {
- log.error(format("Could not write json file for a %s account.", paymentMethodId), ex);
- throw new IllegalStateException(
- format("cannot create a payment account form for a %s payment method", paymentMethodId));
+ String errMsg = format("cannot create a payment account form for a %s payment method", paymentMethodId);
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException(errMsg);
}
return file;
}
@@ -184,27 +186,32 @@ public String toJsonString(File jsonFile) {
checkNotNull(jsonFile, "json file cannot be null");
return new String(Files.readAllBytes(Paths.get(jsonFile.getAbsolutePath())));
} catch (IOException ex) {
- throw new IllegalStateException(format("cannot read content of file '%s'",
- jsonFile.getAbsolutePath()), ex);
+ String errMsg = format("cannot read json string from file '%s'",
+ jsonFile.getAbsolutePath());
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException(errMsg);
}
}
@VisibleForTesting
- public URI getClickableURI(File jsonForm) {
+ public URI getClickableURI(File jsonFile) {
try {
return new URI("file",
"",
- jsonForm.toURI().getPath(),
+ jsonFile.toURI().getPath(),
null,
null);
} catch (URISyntaxException ex) {
- throw new IllegalArgumentException("", ex);
+ String errMsg = format("cannot create clickable url to file '%s'",
+ jsonFile.getAbsolutePath());
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException(errMsg);
}
}
@VisibleForTesting
public static File getTmpJsonFile(String paymentMethodId) {
- File file = null;
+ File file;
try {
// Creates a tmp file that includes a random number string between the
// prefix and suffix, i.e., sepa_form_13243546575879.json, so there is
@@ -213,7 +220,10 @@ public static File getTmpJsonFile(String paymentMethodId) {
".json",
Paths.get(getProperty("java.io.tmpdir")).toFile());
} catch (IOException ex) {
- log.error("", ex);
+ String errMsg = format("cannot create json file for a %s payment method",
+ paymentMethodId);
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException(errMsg);
}
return file;
}
diff --git a/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java b/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
index fe5e81035a7..e60d5c722a7 100644
--- a/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
+++ b/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
@@ -29,6 +29,8 @@
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
+import org.apache.commons.lang3.StringUtils;
+
import java.io.IOException;
import java.util.ArrayList;
@@ -115,8 +117,10 @@ public void write(JsonWriter out, PaymentAccount account) throws IOException {
out.value("Your " + fieldName.toLowerCase());
}
} catch (Exception ex) {
- throw new IllegalStateException(
- format("cannot not serialize a %s", account.getClass().getSimpleName()), ex);
+ String errMsg = format("cannot create a new %s json form",
+ account.getClass().getSimpleName());
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException("programmer error: " + errMsg);
}
});
out.endObject();
@@ -173,15 +177,17 @@ private void invokeSetterMethod(PaymentAccount account, Field field, JsonReader
} else if (isSetterOnPaymentAccountPayloadClass(setter.get(), account)) {
setter.get().invoke(account.getPaymentAccountPayload(), nextStringOrNull(jsonReader));
} else {
- String exMsg = format("programmer error: cannot de-serialize json to a '%s' using reflection"
+ String errMsg = format("programmer error: cannot de-serialize json to a '%s' using reflection"
+ " because the setter method's declaring class was not found.",
account.getClass().getSimpleName());
- throw new IllegalStateException(exMsg);
+ throw new IllegalStateException(errMsg);
}
} catch (IllegalAccessException | InvocationTargetException ex) {
- throw new IllegalStateException(
- format("programmer error: cannot de-serialize json to a '%s' due to reflection error.",
- account.getClass().getSimpleName()), ex);
+ String errMsg = format("cannot set field value for %s on %s",
+ field.getName(),
+ account.getClass().getSimpleName());
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException("programmer error: " + errMsg);
}
} else {
throw new IllegalStateException(
@@ -229,9 +235,9 @@ private String nextStringOrNull(JsonReader in) {
return in.nextString();
}
} catch (IOException ex) {
- throw new IllegalStateException(
- "programmer error: cannot not peek at next string value in json reader.",
- ex);
+ String errMsg = "cannot see next string in json reader";
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException("programmer error: " + errMsg);
}
}
@@ -245,9 +251,9 @@ private Long nextLongOrNull(JsonReader in) {
return in.nextLong();
}
} catch (IOException ex) {
- throw new IllegalStateException(
- "programmer error: cannot not peek at next long value in json reader.",
- ex);
+ String errMsg = "cannot see next long in json reader";
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException("programmer error: " + errMsg);
}
}
@@ -305,9 +311,11 @@ private Class getPaymentAccountPayloadType() {
return (Class) Class.forName(pkg.getName()
+ "." + paymentAccountType.getSimpleName() + "Payload");
} catch (Exception ex) {
- throw new IllegalStateException(
- format("programmer error: cannot get payload class for %s",
- paymentAccountType.getSimpleName()), ex);
+ String errMsg = format("cannot get the payload class for %s",
+ paymentAccountType.getSimpleName());
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException("programmer error: " + errMsg);
+
}
}
@@ -317,16 +325,14 @@ private PaymentAccount initNewPaymentAccount() {
PaymentAccount paymentAccount = (PaymentAccount) constructor.newInstance();
paymentAccount.init();
return paymentAccount;
- } catch (NoSuchMethodException ex) {
- throw new IllegalStateException(
- format("programmer error: no default declared constructor found for class %s",
- paymentAccountType.getSimpleName()),
- ex);
- } catch (IllegalAccessException | InstantiationException | InvocationTargetException ex) {
- throw new IllegalStateException(
- format("programmer error: cannot instantiate class %s",
- paymentAccountType.getSimpleName()),
- ex);
+ } catch (NoSuchMethodException
+ | IllegalAccessException
+ | InstantiationException
+ | InvocationTargetException ex) {
+ String errMsg = format("cannot instantiate a new %s",
+ paymentAccountType.getSimpleName());
+ log.error(StringUtils.capitalize(errMsg) + ".", ex);
+ throw new IllegalStateException("programmer error: " + errMsg);
}
}
}
From 459b2a9c4983f9326301b2dcdff87109ce76d4aa Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Fri, 20 Nov 2020 16:46:36 -0300
Subject: [PATCH 40/52] Add create payment account (api) tests
---
.../java/bisq/apitest/method/MethodTest.java | 11 +-
.../payment/AbstractPaymentAccountTest.java | 87 +-
.../payment/CreatePaymentAccountTest.java | 788 ++++++++++++++----
.../method/payment/GetPaymentMethodsTest.java | 4 +-
.../apitest/scenario/PaymentAccountTest.java | 46 +-
5 files changed, 718 insertions(+), 218 deletions(-)
diff --git a/apitest/src/test/java/bisq/apitest/method/MethodTest.java b/apitest/src/test/java/bisq/apitest/method/MethodTest.java
index 03cb6cb0b3c..153f3c90c53 100644
--- a/apitest/src/test/java/bisq/apitest/method/MethodTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/MethodTest.java
@@ -294,14 +294,17 @@ protected final bisq.core.payment.PaymentAccount createPaymentAccount(BisqAppCon
return fromProto(paymentAccountsService.createPaymentAccount(req).getPaymentAccount());
}
- protected static PaymentAccount getDefaultPerfectDummyPaymentAccount(BisqAppConfig bisqAppConfig) {
+ protected static List getPaymentAccounts(BisqAppConfig bisqAppConfig) {
var req = GetPaymentAccountsRequest.newBuilder().build();
- var paymentAccountsService = grpcStubs(bisqAppConfig).paymentAccountsService;
- PaymentAccount paymentAccount = paymentAccountsService.getPaymentAccounts(req)
+ return grpcStubs(bisqAppConfig).paymentAccountsService.getPaymentAccounts(req)
.getPaymentAccountsList()
.stream()
.sorted(comparing(PaymentAccount::getCreationDate))
- .collect(Collectors.toList()).get(0);
+ .collect(Collectors.toList());
+ }
+
+ protected static PaymentAccount getDefaultPerfectDummyPaymentAccount(BisqAppConfig bisqAppConfig) {
+ PaymentAccount paymentAccount = getPaymentAccounts(bisqAppConfig).get(0);
assertEquals("PerfectMoney dummy", paymentAccount.getAccountName());
return paymentAccount;
}
diff --git a/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java
index 1eb7f91c9a4..dfefd3d2828 100644
--- a/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java
@@ -2,6 +2,7 @@
import bisq.core.api.model.PaymentAccountForm;
import bisq.core.locale.Res;
+import bisq.core.locale.TradeCurrency;
import bisq.core.payment.PaymentAccount;
import bisq.proto.grpc.GetPaymentAccountsRequest;
@@ -18,6 +19,7 @@
import java.io.OutputStreamWriter;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -30,10 +32,7 @@
import static java.lang.String.format;
import static java.lang.System.getProperty;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@@ -47,9 +46,11 @@ public class AbstractPaymentAccountTest extends MethodTest {
static final String PROPERTY_NAME_PAYMENT_METHOD_ID = "paymentMethodId";
+ static final String PROPERTY_NAME_ACCOUNT_ID = "accountId";
static final String PROPERTY_NAME_ACCOUNT_NAME = "accountName";
static final String PROPERTY_NAME_ACCOUNT_NR = "accountNr";
static final String PROPERTY_NAME_ACCOUNT_TYPE = "accountType";
+ static final String PROPERTY_NAME_ANSWER = "answer";
static final String PROPERTY_NAME_BANK_ACCOUNT_NAME = "bankAccountName";
static final String PROPERTY_NAME_BANK_ACCOUNT_NUMBER = "bankAccountNumber";
static final String PROPERTY_NAME_BANK_ACCOUNT_TYPE = "bankAccountType";
@@ -67,6 +68,7 @@ public class AbstractPaymentAccountTest extends MethodTest {
static final String PROPERTY_NAME_EMAIL = "email";
static final String PROPERTY_NAME_EMAIL_OR_MOBILE_NR = "emailOrMobileNr";
static final String PROPERTY_NAME_EXTRA_INFO = "extraInfo";
+ static final String PROPERTY_NAME_HOLDER_EMAIL = "holderEmail";
static final String PROPERTY_NAME_HOLDER_NAME = "holderName";
static final String PROPERTY_NAME_HOLDER_TAX_ID = "holderTaxId";
static final String PROPERTY_NAME_IBAN = "iban";
@@ -74,13 +76,19 @@ public class AbstractPaymentAccountTest extends MethodTest {
static final String PROPERTY_NAME_NATIONAL_ACCOUNT_ID = "nationalAccountId";
static final String PROPERTY_NAME_PAY_ID = "payid";
static final String PROPERTY_NAME_POSTAL_ADDRESS = "postalAddress";
+ static final String PROPERTY_NAME_PROMPT_PAY_ID = "promptPayId";
+ static final String PROPERTY_NAME_QUESTION = "question";
+ static final String PROPERTY_NAME_REQUIREMENTS = "requirements";
+ static final String PROPERTY_NAME_SORT_CODE = "sortCode";
+ static final String PROPERTY_NAME_STATE = "state";
+ static final String PROPERTY_NAME_USERNAME = "userName";
static final Gson GSON = new GsonBuilder()
.setPrettyPrinting()
.serializeNulls()
.create();
- static final Map EXPECTED_FORM = new HashMap<>();
+ static final Map COMPLETED_FORM_MAP = new HashMap<>();
// A payment account serializer / deserializer.
static final PaymentAccountForm PAYMENT_ACCOUNT_FORM = new PaymentAccountForm();
@@ -94,7 +102,7 @@ protected final File getEmptyForm(TestInfo testInfo, String paymentMethodId) {
// This would normally be done in @BeforeEach, but these test cases might be
// called from a single 'scenario' test case, and the @BeforeEach -> clear()
// would be skipped.
- EXPECTED_FORM.clear();
+ COMPLETED_FORM_MAP.clear();
File emptyForm = getPaymentAccountForm(alicedaemon, paymentMethodId);
// A short cut over the API:
@@ -121,7 +129,46 @@ protected final void verifyEmptyForm(File jsonForm, String paymentMethodId, Stri
}
}
- protected final File fillPaymentAccountForm() {
+ protected final void verifyCommonFormEntries(PaymentAccount paymentAccount) {
+ // All PaymentAccount subclasses have paymentMethodId and an accountName fields.
+ assertNotNull(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_PAYMENT_METHOD_ID), paymentAccount.getPaymentMethod().getId());
+ assertTrue(paymentAccount.getCreationDate().getTime() > 0);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NAME), paymentAccount.getAccountName());
+ }
+
+ protected final void verifyAccountSingleTradeCurrency(PaymentAccount paymentAccount,
+ String expectedCurrencyCode) {
+ assertNotNull(paymentAccount.getSingleTradeCurrency());
+ assertEquals(expectedCurrencyCode, paymentAccount.getSingleTradeCurrency().getCode());
+ }
+
+ protected final void verifyAccountTradeCurrencies(List expectedTradeCurrencies,
+ PaymentAccount paymentAccount) {
+ assertNotNull(paymentAccount.getTradeCurrencies());
+ assertArrayEquals(expectedTradeCurrencies.toArray(), paymentAccount.getTradeCurrencies().toArray());
+ }
+
+ protected final void verifyUserPayloadHasPaymentAccountWithId(String paymentAccountId) {
+ var getPaymentAccountsRequest = GetPaymentAccountsRequest.newBuilder().build();
+ var reply = grpcStubs(alicedaemon)
+ .paymentAccountsService.getPaymentAccounts(getPaymentAccountsRequest);
+ Optional paymentAccount = reply.getPaymentAccountsList().stream()
+ .filter(a -> a.getId().equals(paymentAccountId))
+ .findFirst();
+ assertTrue(paymentAccount.isPresent());
+ }
+
+ protected final String getCompletedFormAsJsonString() {
+ File completedForm = fillPaymentAccountForm();
+ String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
+ if (log.isDebugEnabled())
+ log.debug("Completed form: {}", jsonString);
+
+ return jsonString;
+ }
+
+ private File fillPaymentAccountForm() {
File tmpJsonForm = null;
try {
tmpJsonForm = File.createTempFile("temp_acct_form_",
@@ -132,7 +179,7 @@ protected final File fillPaymentAccountForm() {
writer.beginObject();
writer.name(PROPERTY_NAME_COMMENT);
writer.value(PROPERTY_VALUE_COMMENT);
- for (Map.Entry entry : EXPECTED_FORM.entrySet()) {
+ for (Map.Entry entry : COMPLETED_FORM_MAP.entrySet()) {
String k = entry.getKey();
Object v = entry.getValue();
writer.name(k);
@@ -142,31 +189,9 @@ protected final File fillPaymentAccountForm() {
writer.close();
} catch (IOException ex) {
log.error("", ex);
- fail(format("Could not write json file from form entries %s", EXPECTED_FORM));
+ fail(format("Could not write json file from form entries %s", COMPLETED_FORM_MAP));
}
return tmpJsonForm;
}
- protected final void verifyCommonFormEntries(PaymentAccount paymentAccount) {
- // All PaymentAccount subclasses have paymentMethodId and an accountName fields.
- assertNotNull(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_PAYMENT_METHOD_ID), paymentAccount.getPaymentMethod().getId());
- assertTrue(paymentAccount.getCreationDate().getTime() > 0);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_ACCOUNT_NAME), paymentAccount.getAccountName());
- }
-
- protected final void verifyAccountFiatCurrency(PaymentAccount paymentAccount, String expectedCurrencyCode) {
- assertNotNull(paymentAccount.getSingleTradeCurrency());
- assertEquals(expectedCurrencyCode, paymentAccount.getSingleTradeCurrency().getCode());
- }
-
- protected final void verifyUserPayloadHasPaymentAccountWithId(String paymentAccountId) {
- var getPaymentAccountsRequest = GetPaymentAccountsRequest.newBuilder().build();
- var reply = grpcStubs(alicedaemon)
- .paymentAccountsService.getPaymentAccounts(getPaymentAccountsRequest);
- Optional paymentAccount = reply.getPaymentAccountsList().stream()
- .filter(a -> a.getId().equals(paymentAccountId))
- .findFirst();
- assertTrue(paymentAccount.isPresent());
- }
}
diff --git a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
index 09dae2ba1d7..a861569405c 100644
--- a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
@@ -17,17 +17,38 @@
package bisq.apitest.method.payment;
+import bisq.core.payment.AdvancedCashAccount;
+import bisq.core.payment.AliPayAccount;
import bisq.core.payment.AustraliaPayid;
+import bisq.core.payment.CashDepositAccount;
import bisq.core.payment.ChaseQuickPayAccount;
import bisq.core.payment.ClearXchangeAccount;
import bisq.core.payment.F2FAccount;
+import bisq.core.payment.FasterPaymentsAccount;
import bisq.core.payment.HalCashAccount;
+import bisq.core.payment.InteracETransferAccount;
import bisq.core.payment.JapanBankAccount;
+import bisq.core.payment.MoneyBeamAccount;
+import bisq.core.payment.MoneyGramAccount;
import bisq.core.payment.NationalBankAccount;
+import bisq.core.payment.PerfectMoneyAccount;
+import bisq.core.payment.PopmoneyAccount;
+import bisq.core.payment.PromptPayAccount;
+import bisq.core.payment.RevolutAccount;
+import bisq.core.payment.SameBankAccount;
import bisq.core.payment.SepaAccount;
+import bisq.core.payment.SepaInstantAccount;
+import bisq.core.payment.SpecificBanksAccount;
import bisq.core.payment.SwishAccount;
+import bisq.core.payment.TransferwiseAccount;
import bisq.core.payment.USPostalMoneyOrderAccount;
+import bisq.core.payment.UpholdAccount;
+import bisq.core.payment.WeChatPayAccount;
+import bisq.core.payment.WesternUnionAccount;
import bisq.core.payment.payload.BankAccountPayload;
+import bisq.core.payment.payload.CashDepositAccountPayload;
+import bisq.core.payment.payload.SameBankAccountPayload;
+import bisq.core.payment.payload.SpecificBanksAccountPayload;
import java.io.File;
@@ -38,13 +59,13 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
+import static bisq.core.locale.CurrencyUtil.*;
import static bisq.core.payment.payload.PaymentMethod.*;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@@ -65,35 +86,119 @@ public static void setUp() {
}
@Test
- @Order(1)
+ public void testCreateAdvancedCashAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, ADVANCED_CASH_ID);
+ verifyEmptyForm(emptyForm,
+ ADVANCED_CASH_ID,
+ PROPERTY_NAME_ACCOUNT_NR);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, ADVANCED_CASH_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Advanced Cash Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "0000 1111 2222");
+ String jsonString = getCompletedFormAsJsonString();
+ AdvancedCashAccount paymentAccount = (AdvancedCashAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountTradeCurrencies(getAllAdvancedCashCurrencies(), paymentAccount);
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
+ public void testCreateAliPayAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, ALI_PAY_ID);
+ verifyEmptyForm(emptyForm,
+ ALI_PAY_ID,
+ PROPERTY_NAME_ACCOUNT_NR);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, ALI_PAY_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Ali Pay Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "2222 3333 4444");
+ String jsonString = getCompletedFormAsJsonString();
+ AliPayAccount paymentAccount = (AliPayAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "CNY");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
public void testCreateAustraliaPayidAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, AUSTRALIA_PAYID_ID);
verifyEmptyForm(emptyForm,
AUSTRALIA_PAYID_ID,
PROPERTY_NAME_BANK_ACCOUNT_NAME);
-
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, AUSTRALIA_PAYID_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Australia Pay ID Account");
- EXPECTED_FORM.put(PROPERTY_NAME_PAY_ID, "123 456 789");
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_ACCOUNT_NAME, "Credit Union Australia");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, AUSTRALIA_PAYID_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Australia Pay ID Account");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAY_ID, "123 456 789");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_ACCOUNT_NAME, "Credit Union Australia");
+ String jsonString = getCompletedFormAsJsonString();
+ AustraliaPayid paymentAccount = (AustraliaPayid) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "AUD");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_PAY_ID), paymentAccount.getPayid());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_ACCOUNT_NAME), paymentAccount.getBankAccountName());
if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
- AustraliaPayid paymentAccount = (AustraliaPayid) createPaymentAccount(alicedaemon, jsonString);
+
+ @Test
+ public void testCreateCashDepositAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, CASH_DEPOSIT_ID);
+ verifyEmptyForm(emptyForm,
+ CASH_DEPOSIT_ID,
+ PROPERTY_NAME_ACCOUNT_NR,
+ PROPERTY_NAME_ACCOUNT_TYPE,
+ PROPERTY_NAME_BANK_ID,
+ PROPERTY_NAME_BANK_NAME,
+ PROPERTY_NAME_BRANCH_ID,
+ PROPERTY_NAME_COUNTRY,
+ PROPERTY_NAME_HOLDER_EMAIL,
+ PROPERTY_NAME_HOLDER_NAME,
+ PROPERTY_NAME_HOLDER_TAX_ID,
+ PROPERTY_NAME_NATIONAL_ACCOUNT_ID,
+ PROPERTY_NAME_REQUIREMENTS);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, CASH_DEPOSIT_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Cash Deposit Account");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "4444 5555 6666");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_TYPE, "Checking");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_ID, "0001");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_NAME, "BoF");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BRANCH_ID, "99-8888-7654");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "FR");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_EMAIL, "jean@johnson.info");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Jean Johnson");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_TAX_ID, "123456789");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_NATIONAL_ACCOUNT_ID, "123456789");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_REQUIREMENTS, "Requirements...");
+ String jsonString = getCompletedFormAsJsonString();
+ CashDepositAccount paymentAccount = (CashDepositAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "AUD");
+ verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_PAY_ID), paymentAccount.getPayid());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_ACCOUNT_NAME), paymentAccount.getBankAccountName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
+ Objects.requireNonNull(paymentAccount.getCountry()).code);
+
+ CashDepositAccountPayload payload = (CashDepositAccountPayload) paymentAccount.getPaymentAccountPayload();
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), payload.getAccountNr());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_TYPE), payload.getAccountType());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_ID), payload.getBankId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_NAME), payload.getBankName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BRANCH_ID), payload.getBranchId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_EMAIL), payload.getHolderEmail());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), payload.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_TAX_ID), payload.getHolderTaxId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_NATIONAL_ACCOUNT_ID), payload.getNationalAccountId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_REQUIREMENTS), payload.getRequirements());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testBrazilNationalBankAccountForm(TestInfo testInfo) {
+ public void testCreateBrazilNationalBankAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, NATIONAL_BANK_ID);
verifyEmptyForm(emptyForm,
NATIONAL_BANK_ID,
@@ -105,101 +210,83 @@ public void testBrazilNationalBankAccountForm(TestInfo testInfo) {
PROPERTY_NAME_HOLDER_NAME,
PROPERTY_NAME_HOLDER_TAX_ID,
PROPERTY_NAME_NATIONAL_ACCOUNT_ID);
-
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, NATIONAL_BANK_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Banco do Brasil");
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NR, "456789-87");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, NATIONAL_BANK_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Banco do Brasil");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "456789-87");
// No BankId is required for BR.
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_NAME, "Banco do Brasil");
- EXPECTED_FORM.put(PROPERTY_NAME_BRANCH_ID, "456789-10");
- EXPECTED_FORM.put(PROPERTY_NAME_COUNTRY, "BR");
- EXPECTED_FORM.put(PROPERTY_NAME_HOLDER_NAME, "Joao da Silva");
- EXPECTED_FORM.put(PROPERTY_NAME_HOLDER_TAX_ID, "123456789");
- EXPECTED_FORM.put(PROPERTY_NAME_NATIONAL_ACCOUNT_ID, "123456789");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
- if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
-
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_NAME, "Banco do Brasil");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BRANCH_ID, "456789-10");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "BR");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Joao da Silva");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_TAX_ID, "123456789");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_NATIONAL_ACCOUNT_ID, "123456789");
+ String jsonString = getCompletedFormAsJsonString();
NationalBankAccount paymentAccount = (NationalBankAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "BRL");
+ verifyAccountSingleTradeCurrency(paymentAccount, "BRL");
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_COUNTRY),
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
BankAccountPayload payload = (BankAccountPayload) paymentAccount.getPaymentAccountPayload();
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_ACCOUNT_NR), payload.getAccountNr());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), payload.getAccountNr());
// When no BankId is required, getBankId() returns bankName.
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_NAME), payload.getBankId());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_NAME), payload.getBankName());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BRANCH_ID), payload.getBranchId());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_HOLDER_NAME), payload.getHolderName());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_HOLDER_TAX_ID), payload.getHolderTaxId());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_NATIONAL_ACCOUNT_ID), payload.getNationalAccountId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_NAME), payload.getBankId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_NAME), payload.getBankName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BRANCH_ID), payload.getBranchId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), payload.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_TAX_ID), payload.getHolderTaxId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_NATIONAL_ACCOUNT_ID), payload.getNationalAccountId());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testChaseQuickPayAccountForm(TestInfo testInfo) {
+ public void testCreateChaseQuickPayAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, CHASE_QUICK_PAY_ID);
verifyEmptyForm(emptyForm,
CHASE_QUICK_PAY_ID,
PROPERTY_NAME_EMAIL,
PROPERTY_NAME_HOLDER_NAME);
-
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, CHASE_QUICK_PAY_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Quick Pay Acct");
- EXPECTED_FORM.put(PROPERTY_NAME_EMAIL, "johndoe@quickpay.com");
- EXPECTED_FORM.put(PROPERTY_NAME_HOLDER_NAME, "John Doe");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
- if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
-
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, CHASE_QUICK_PAY_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Quick Pay Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_EMAIL, "johndoe@quickpay.com");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "John Doe");
+ String jsonString = getCompletedFormAsJsonString();
ChaseQuickPayAccount paymentAccount = (ChaseQuickPayAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency(paymentAccount, "USD");
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testClearXChangeAccountForm(TestInfo testInfo) {
+ public void testCreateClearXChangeAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, CLEAR_X_CHANGE_ID);
verifyEmptyForm(emptyForm,
CLEAR_X_CHANGE_ID,
PROPERTY_NAME_EMAIL_OR_MOBILE_NR,
PROPERTY_NAME_HOLDER_NAME);
-
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, CLEAR_X_CHANGE_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "USD Zelle Account");
- EXPECTED_FORM.put(PROPERTY_NAME_EMAIL_OR_MOBILE_NR, "jane@doe.com");
- EXPECTED_FORM.put(PROPERTY_NAME_HOLDER_NAME, "Jane Doe");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
- if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
-
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, CLEAR_X_CHANGE_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "USD Zelle Account");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_EMAIL_OR_MOBILE_NR, "jane@doe.com");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Jane Doe");
+ String jsonString = getCompletedFormAsJsonString();
ClearXchangeAccount paymentAccount = (ClearXchangeAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency(paymentAccount, "USD");
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_EMAIL_OR_MOBILE_NR), paymentAccount.getEmailOrMobileNr());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL_OR_MOBILE_NR), paymentAccount.getEmailOrMobileNr());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testF2FAccountForm(TestInfo testInfo) {
+ public void testCreateF2FAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, F2F_ID);
verifyEmptyForm(emptyForm,
F2F_ID,
@@ -207,60 +294,97 @@ public void testF2FAccountForm(TestInfo testInfo) {
PROPERTY_NAME_CITY,
PROPERTY_NAME_CONTACT,
PROPERTY_NAME_EXTRA_INFO);
-
-
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, F2F_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Conta Cara a Cara");
- EXPECTED_FORM.put(PROPERTY_NAME_COUNTRY, "BR");
- EXPECTED_FORM.put(PROPERTY_NAME_CITY, "Rio de Janeiro");
- EXPECTED_FORM.put(PROPERTY_NAME_CONTACT, "Freddy Beira Mar");
- EXPECTED_FORM.put(PROPERTY_NAME_EXTRA_INFO, "So fim de semana");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
- if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
-
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, F2F_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Conta Cara a Cara");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "BR");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_CITY, "Rio de Janeiro");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_CONTACT, "Freddy Beira Mar");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_EXTRA_INFO, "So fim de semana");
+ String jsonString = getCompletedFormAsJsonString();
F2FAccount paymentAccount = (F2FAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "BRL");
+ verifyAccountSingleTradeCurrency(paymentAccount, "BRL");
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_COUNTRY),
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_CITY), paymentAccount.getCity());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_CONTACT), paymentAccount.getContact());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_EXTRA_INFO), paymentAccount.getExtraInfo());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_CITY), paymentAccount.getCity());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_CONTACT), paymentAccount.getContact());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EXTRA_INFO), paymentAccount.getExtraInfo());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testHalCashAccountForm(TestInfo testInfo) {
+ public void testCreateFasterPaymentsAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, FASTER_PAYMENTS_ID);
+ verifyEmptyForm(emptyForm,
+ FASTER_PAYMENTS_ID,
+ PROPERTY_NAME_ACCOUNT_NR,
+ PROPERTY_NAME_SORT_CODE);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, FASTER_PAYMENTS_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Faster Payments Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "9999 8888 7777");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_SORT_CODE, "3127");
+ String jsonString = getCompletedFormAsJsonString();
+ FasterPaymentsAccount paymentAccount = (FasterPaymentsAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "GBP");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_SORT_CODE), paymentAccount.getSortCode());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
+ public void testCreateHalCashAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, HAL_CASH_ID);
verifyEmptyForm(emptyForm,
HAL_CASH_ID,
PROPERTY_NAME_MOBILE_NR);
-
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, HAL_CASH_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Hal Cash Acct");
- EXPECTED_FORM.put(PROPERTY_NAME_MOBILE_NR, "798 123 456");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, HAL_CASH_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Hal Cash Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_MOBILE_NR, "798 123 456");
+ String jsonString = getCompletedFormAsJsonString();
+ HalCashAccount paymentAccount = (HalCashAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_MOBILE_NR), paymentAccount.getMobileNr());
if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
- HalCashAccount paymentAccount = (HalCashAccount) createPaymentAccount(alicedaemon, jsonString);
+ @Test
+ public void testCreateInteracETransferAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, INTERAC_E_TRANSFER_ID);
+ verifyEmptyForm(emptyForm,
+ INTERAC_E_TRANSFER_ID,
+ PROPERTY_NAME_HOLDER_NAME,
+ PROPERTY_NAME_EMAIL,
+ PROPERTY_NAME_QUESTION,
+ PROPERTY_NAME_ANSWER);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, INTERAC_E_TRANSFER_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Interac Transfer Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "John Doe");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_EMAIL, "john@doe.info");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_QUESTION, "What is my dog's name?");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ANSWER, "Fido");
+ String jsonString = getCompletedFormAsJsonString();
+ InteracETransferAccount paymentAccount = (InteracETransferAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "EUR");
+ verifyAccountSingleTradeCurrency(paymentAccount, "CAD");
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_MOBILE_NR), paymentAccount.getMobileNr());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_QUESTION), paymentAccount.getQuestion());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ANSWER), paymentAccount.getAnswer());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testJapanBankAccountForm(TestInfo testInfo) {
+ public void testCreateJapanBankAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, JAPAN_BANK_ID);
verifyEmptyForm(emptyForm,
JAPAN_BANK_ID,
@@ -271,125 +395,445 @@ public void testJapanBankAccountForm(TestInfo testInfo) {
PROPERTY_NAME_BANK_ACCOUNT_NAME,
PROPERTY_NAME_BANK_ACCOUNT_TYPE,
PROPERTY_NAME_BANK_ACCOUNT_NUMBER);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, JAPAN_BANK_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Fukuoka Account");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_NAME, "Bank of Kyoto");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_CODE, "FKBKJPJT");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_BRANCH_CODE, "8100-8727");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_BRANCH_NAME, "Fukuoka Branch");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_ACCOUNT_NAME, "Fukuoka Account");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_ACCOUNT_TYPE, "Yen Account");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_ACCOUNT_NUMBER, "8100-8727-0000");
+ String jsonString = getCompletedFormAsJsonString();
+ JapanBankAccount paymentAccount = (JapanBankAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "JPY");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_CODE), paymentAccount.getBankCode());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_NAME), paymentAccount.getBankName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_BRANCH_CODE), paymentAccount.getBankBranchCode());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_BRANCH_NAME), paymentAccount.getBankBranchName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_ACCOUNT_NAME), paymentAccount.getBankAccountName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_ACCOUNT_TYPE), paymentAccount.getBankAccountType());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_ACCOUNT_NUMBER), paymentAccount.getBankAccountNumber());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, JAPAN_BANK_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Fukuoka Account");
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_NAME, "Bank of Kyoto");
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_CODE, "FKBKJPJT");
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_BRANCH_CODE, "8100-8727");
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_BRANCH_NAME, "Fukuoka Branch");
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_ACCOUNT_NAME, "Fukuoka Account");
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_ACCOUNT_TYPE, "Yen Account");
- EXPECTED_FORM.put(PROPERTY_NAME_BANK_ACCOUNT_NUMBER, "8100-8727-0000");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
+ @Test
+ public void testCreateMoneyBeamAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, MONEY_BEAM_ID);
+ verifyEmptyForm(emptyForm,
+ MONEY_BEAM_ID,
+ PROPERTY_NAME_ACCOUNT_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, MONEY_BEAM_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Money Beam Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_ID, "MB 0000 1111");
+ String jsonString = getCompletedFormAsJsonString();
+ MoneyBeamAccount paymentAccount = (MoneyBeamAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_ID), paymentAccount.getAccountId());
if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
- JapanBankAccount paymentAccount = (JapanBankAccount) createPaymentAccount(alicedaemon, jsonString);
+ @Disabled
+ @Test
+ public void testCreateMoneyGramAccount(TestInfo testInfo) {
+ // TODO Check the MoneyGramAccount class, it seems it should be a subclass
+ // of CountryBasedPaymentAccount, and these setters seem wrong:
+ // setState(email)
+ // setHolderName(email)
+ // This is the only test that is breaking as of Fri 20 Nov 2020 03:18:34 PM -03.
+ File emptyForm = getEmptyForm(testInfo, MONEY_GRAM_ID);
+ verifyEmptyForm(emptyForm,
+ MONEY_GRAM_ID,
+ PROPERTY_NAME_HOLDER_NAME,
+ PROPERTY_NAME_EMAIL,
+ PROPERTY_NAME_COUNTRY,
+ PROPERTY_NAME_STATE);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, MONEY_GRAM_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Money Gram Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "John Doe");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_EMAIL, "john@doe.info");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "US");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_STATE, "NY");
+ String jsonString = getCompletedFormAsJsonString();
+ MoneyGramAccount paymentAccount = (MoneyGramAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "JPY");
+ verifyAccountTradeCurrencies(getAllMoneyGramCurrencies(), paymentAccount);
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_CODE), paymentAccount.getBankCode());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_NAME), paymentAccount.getBankName());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_BRANCH_CODE), paymentAccount.getBankBranchCode());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_BRANCH_NAME), paymentAccount.getBankBranchName());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_ACCOUNT_NAME), paymentAccount.getBankAccountName());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_ACCOUNT_TYPE), paymentAccount.getBankAccountType());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BANK_ACCOUNT_NUMBER), paymentAccount.getBankAccountNumber());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getFullName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY), paymentAccount.getCountry());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_STATE), paymentAccount.getState());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testSepaAccountForm(TestInfo testInfo) {
- File emptyForm = getEmptyForm(testInfo, SEPA_ID);
+ public void testCreatePerfectMoneyAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, PERFECT_MONEY_ID);
verifyEmptyForm(emptyForm,
- SEPA_ID,
+ PERFECT_MONEY_ID,
+ PROPERTY_NAME_ACCOUNT_NR);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, PERFECT_MONEY_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Perfect Money Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "PM 0000 1111");
+ String jsonString = getCompletedFormAsJsonString();
+ PerfectMoneyAccount paymentAccount = (PerfectMoneyAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
+ public void testCreatePopmoneyAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, POPMONEY_ID);
+ verifyEmptyForm(emptyForm,
+ POPMONEY_ID,
+ PROPERTY_NAME_ACCOUNT_ID,
+ PROPERTY_NAME_HOLDER_NAME);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, POPMONEY_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Pop Money Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_ID, "POPMONEY 0000 1111");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Jane Doe");
+ String jsonString = getCompletedFormAsJsonString();
+ PopmoneyAccount paymentAccount = (PopmoneyAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_ID), paymentAccount.getAccountId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
+ public void testCreatePromptPayAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, PROMPT_PAY_ID);
+ verifyEmptyForm(emptyForm,
+ PROMPT_PAY_ID,
+ PROPERTY_NAME_PROMPT_PAY_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, PROMPT_PAY_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Prompt Pay Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PROMPT_PAY_ID, "PP 0000 1111");
+ String jsonString = getCompletedFormAsJsonString();
+ PromptPayAccount paymentAccount = (PromptPayAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "THB");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_PROMPT_PAY_ID), paymentAccount.getPromptPayId());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
+ public void testCreateRevolutAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, REVOLUT_ID);
+ verifyEmptyForm(emptyForm,
+ REVOLUT_ID,
+ PROPERTY_NAME_USERNAME);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, REVOLUT_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Revolut Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_USERNAME, "revolut123");
+ String jsonString = getCompletedFormAsJsonString();
+ RevolutAccount paymentAccount = (RevolutAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountTradeCurrencies(getAllRevolutCurrencies(), paymentAccount);
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_USERNAME), paymentAccount.getUserName());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
+ public void testCreateSameBankAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, SAME_BANK_ID);
+ verifyEmptyForm(emptyForm,
+ SAME_BANK_ID,
+ PROPERTY_NAME_ACCOUNT_NR,
+ PROPERTY_NAME_ACCOUNT_TYPE,
+ PROPERTY_NAME_BANK_NAME,
+ PROPERTY_NAME_BRANCH_ID,
+ PROPERTY_NAME_COUNTRY,
+ PROPERTY_NAME_HOLDER_NAME,
+ PROPERTY_NAME_HOLDER_TAX_ID,
+ PROPERTY_NAME_NATIONAL_ACCOUNT_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, SAME_BANK_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Same Bank Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "000 1 4567");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_TYPE, "Checking");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_NAME, "HSBC");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BRANCH_ID, "111");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "GB");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Jane Doe");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_TAX_ID, "123456789");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_NATIONAL_ACCOUNT_ID, "123456789");
+ String jsonString = getCompletedFormAsJsonString();
+ SameBankAccount paymentAccount = (SameBankAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "GBP");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
+ Objects.requireNonNull(paymentAccount.getCountry()).code);
+ SameBankAccountPayload payload = (SameBankAccountPayload) paymentAccount.getPaymentAccountPayload();
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), payload.getAccountNr());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_TYPE), payload.getAccountType());
+ // The bankId == bankName because bank id is not required in the UK.
+ assertEquals(payload.getBankId(), payload.getBankName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_NAME), payload.getBankName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BRANCH_ID), payload.getBranchId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), payload.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_TAX_ID), payload.getHolderTaxId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_NATIONAL_ACCOUNT_ID), payload.getNationalAccountId());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
+ public void testCreateSepaInstantAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, SEPA_INSTANT_ID);
+ verifyEmptyForm(emptyForm,
+ SEPA_INSTANT_ID,
PROPERTY_NAME_COUNTRY,
PROPERTY_NAME_HOLDER_NAME,
PROPERTY_NAME_IBAN,
PROPERTY_NAME_BIC);
-
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, SEPA_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Conta Sepa");
- EXPECTED_FORM.put(PROPERTY_NAME_COUNTRY, "PT");
- EXPECTED_FORM.put(PROPERTY_NAME_HOLDER_NAME, "Jose da Silva");
- EXPECTED_FORM.put(PROPERTY_NAME_IBAN, "909-909");
- EXPECTED_FORM.put(PROPERTY_NAME_BIC, "909");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, SEPA_INSTANT_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Conta Sepa Instant");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "PT");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Jose da Silva");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_IBAN, "909-909");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BIC, "909");
+ String jsonString = getCompletedFormAsJsonString();
+ SepaInstantAccount paymentAccount = (SepaInstantAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
+ Objects.requireNonNull(paymentAccount.getCountry()).code);
+ verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_IBAN), paymentAccount.getIban());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BIC), paymentAccount.getBic());
+ // bankId == bic
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BIC), paymentAccount.getBankId());
if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+ @Test
+ public void testCreateSepaAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, SEPA_ID);
+ verifyEmptyForm(emptyForm,
+ SEPA_ID,
+ PROPERTY_NAME_COUNTRY,
+ PROPERTY_NAME_HOLDER_NAME,
+ PROPERTY_NAME_IBAN,
+ PROPERTY_NAME_BIC);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, SEPA_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Conta Sepa");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "PT");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Jose da Silva");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_IBAN, "909-909");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BIC, "909");
+ String jsonString = getCompletedFormAsJsonString();
SepaAccount paymentAccount = (SepaAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_COUNTRY), Objects.requireNonNull(paymentAccount.getCountry()).code);
- verifyAccountFiatCurrency(paymentAccount, "EUR");
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
+ Objects.requireNonNull(paymentAccount.getCountry()).code);
+ verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_IBAN), paymentAccount.getIban());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BIC), paymentAccount.getBic());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_IBAN), paymentAccount.getIban());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BIC), paymentAccount.getBic());
// bankId == bic
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_BIC), paymentAccount.getBankId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BIC), paymentAccount.getBankId());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testSwishAccountForm(TestInfo testInfo) {
+ public void testCreateSpecificBanksAccount(TestInfo testInfo) {
+ // TODO Supporting set of accepted banks may require some refactoring
+ // of the SpecificBanksAccount and SpecificBanksAccountPayload classes, i.e.,
+ // public void setAcceptedBanks(String... bankNames) { ... }
+ File emptyForm = getEmptyForm(testInfo, SPECIFIC_BANKS_ID);
+ verifyEmptyForm(emptyForm,
+ SPECIFIC_BANKS_ID,
+ PROPERTY_NAME_ACCOUNT_NR,
+ PROPERTY_NAME_ACCOUNT_TYPE,
+ PROPERTY_NAME_BANK_NAME,
+ PROPERTY_NAME_BRANCH_ID,
+ PROPERTY_NAME_COUNTRY,
+ PROPERTY_NAME_HOLDER_NAME,
+ PROPERTY_NAME_HOLDER_TAX_ID,
+ PROPERTY_NAME_NATIONAL_ACCOUNT_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, SPECIFIC_BANKS_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Specific Banks Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "000 1 4567");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_TYPE, "Checking");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BANK_NAME, "HSBC");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_BRANCH_ID, "111");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "GB");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Jane Doe");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_TAX_ID, "123456789");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_NATIONAL_ACCOUNT_ID, "123456789");
+ String jsonString = getCompletedFormAsJsonString();
+ SpecificBanksAccount paymentAccount = (SpecificBanksAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "GBP");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
+ Objects.requireNonNull(paymentAccount.getCountry()).code);
+ SpecificBanksAccountPayload payload = (SpecificBanksAccountPayload) paymentAccount.getPaymentAccountPayload();
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), payload.getAccountNr());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_TYPE), payload.getAccountType());
+ // The bankId == bankName because bank id is not required in the UK.
+ assertEquals(payload.getBankId(), payload.getBankName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_NAME), payload.getBankName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BRANCH_ID), payload.getBranchId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), payload.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_TAX_ID), payload.getHolderTaxId());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_NATIONAL_ACCOUNT_ID), payload.getNationalAccountId());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
+
+ @Test
+ public void testCreateSwishAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, SWISH_ID);
verifyEmptyForm(emptyForm,
SWISH_ID,
PROPERTY_NAME_MOBILE_NR,
PROPERTY_NAME_HOLDER_NAME);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, SWISH_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Swish Account");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_MOBILE_NR, "+46 7 6060 0101");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Swish Account Holder");
+ String jsonString = getCompletedFormAsJsonString();
+ SwishAccount paymentAccount = (SwishAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "SEK");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_MOBILE_NR), paymentAccount.getMobileNr());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, SWISH_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Swish Account");
- EXPECTED_FORM.put(PROPERTY_NAME_MOBILE_NR, "+46 7 6060 0101");
- EXPECTED_FORM.put(PROPERTY_NAME_HOLDER_NAME, "Swish Account Holder");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
+ @Test
+ public void testCreateTransferwiseAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, TRANSFERWISE_ID);
+ verifyEmptyForm(emptyForm,
+ TRANSFERWISE_ID,
+ PROPERTY_NAME_EMAIL);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, TRANSFERWISE_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Transferwise Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_EMAIL, "jan@doe.info");
+ String jsonString = getCompletedFormAsJsonString();
+ TransferwiseAccount paymentAccount = (TransferwiseAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountTradeCurrencies(getAllTransferwiseCurrencies(), paymentAccount);
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
- SwishAccount paymentAccount = (SwishAccount) createPaymentAccount(alicedaemon, jsonString);
+ @Test
+ public void testCreateUpholdAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, UPHOLD_ID);
+ verifyEmptyForm(emptyForm,
+ UPHOLD_ID,
+ PROPERTY_NAME_ACCOUNT_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, UPHOLD_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Uphold Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_ID, "UA 9876");
+ String jsonString = getCompletedFormAsJsonString();
+ UpholdAccount paymentAccount = (UpholdAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "SEK");
+ verifyAccountTradeCurrencies(getAllUpholdCurrencies(), paymentAccount);
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_MOBILE_NR), paymentAccount.getMobileNr());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_ID), paymentAccount.getAccountId());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
@Test
- public void testUSPostalMoneyOrderAccountForm(TestInfo testInfo) {
+ public void testCreateUSPostalMoneyOrderAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, US_POSTAL_MONEY_ORDER_ID);
verifyEmptyForm(emptyForm,
US_POSTAL_MONEY_ORDER_ID,
PROPERTY_NAME_HOLDER_NAME,
PROPERTY_NAME_POSTAL_ADDRESS);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, US_POSTAL_MONEY_ORDER_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Bubba's Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Bubba");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_POSTAL_ADDRESS, "000 Westwood Terrace Austin, TX 78700");
+ String jsonString = getCompletedFormAsJsonString();
+ USPostalMoneyOrderAccount paymentAccount = (USPostalMoneyOrderAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_POSTAL_ADDRESS), paymentAccount.getPostalAddress());
+ if (log.isDebugEnabled())
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
- EXPECTED_FORM.put(PROPERTY_NAME_PAYMENT_METHOD_ID, US_POSTAL_MONEY_ORDER_ID);
- EXPECTED_FORM.put(PROPERTY_NAME_ACCOUNT_NAME, "Bubba's Acct");
- EXPECTED_FORM.put(PROPERTY_NAME_HOLDER_NAME, "Bubba");
- EXPECTED_FORM.put(PROPERTY_NAME_POSTAL_ADDRESS, "000 Westwood Terrace Austin, TX 78700");
-
- File completedForm = fillPaymentAccountForm();
- String jsonString = PAYMENT_ACCOUNT_FORM.toJsonString(completedForm);
+ @Test
+ public void testCreateWeChatPayAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, WECHAT_PAY_ID);
+ verifyEmptyForm(emptyForm,
+ WECHAT_PAY_ID,
+ PROPERTY_NAME_ACCOUNT_NR);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, WECHAT_PAY_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "WeChat Pay Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NR, "WC 1234");
+ String jsonString = getCompletedFormAsJsonString();
+ WeChatPayAccount paymentAccount = (WeChatPayAccount) createPaymentAccount(alicedaemon, jsonString);
+ verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
+ verifyAccountSingleTradeCurrency(paymentAccount, "CNY");
+ verifyCommonFormEntries(paymentAccount);
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
if (log.isDebugEnabled())
- log.debug("Completed form: {}", jsonString);
+ log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
+ }
- USPostalMoneyOrderAccount paymentAccount = (USPostalMoneyOrderAccount) createPaymentAccount(alicedaemon, jsonString);
+ @Test
+ public void testCreateWesternUnionAccount(TestInfo testInfo) {
+ File emptyForm = getEmptyForm(testInfo, WESTERN_UNION_ID);
+ verifyEmptyForm(emptyForm,
+ WESTERN_UNION_ID,
+ PROPERTY_NAME_HOLDER_NAME,
+ PROPERTY_NAME_CITY,
+ PROPERTY_NAME_STATE,
+ PROPERTY_NAME_COUNTRY,
+ PROPERTY_NAME_EMAIL);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_PAYMENT_METHOD_ID, WESTERN_UNION_ID);
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_ACCOUNT_NAME, "Western Union Acct");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_HOLDER_NAME, "Jane Doe");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_CITY, "Fargo");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_STATE, "North Dakota");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_COUNTRY, "US");
+ COMPLETED_FORM_MAP.put(PROPERTY_NAME_EMAIL, "jane@doe.info");
+ String jsonString = getCompletedFormAsJsonString();
+ WesternUnionAccount paymentAccount = (WesternUnionAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountFiatCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency(paymentAccount, "USD");
verifyCommonFormEntries(paymentAccount);
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
- assertEquals(EXPECTED_FORM.get(PROPERTY_NAME_POSTAL_ADDRESS), paymentAccount.getPostalAddress());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getFullName());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_CITY), paymentAccount.getCity());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_STATE), paymentAccount.getState());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
+ Objects.requireNonNull(paymentAccount.getCountry()).code);
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
diff --git a/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java b/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java
index acd791f596c..50c5d5b61cd 100644
--- a/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java
@@ -15,7 +15,7 @@
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@@ -43,7 +43,7 @@ public void testGetPaymentMethods() {
.stream()
.map(p -> p.getId())
.collect(Collectors.toList());
- assertTrue(paymentMethodIds.size() > 25);
+ assertEquals(28, paymentMethodIds.size());
}
@AfterAll
diff --git a/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java
index 6227c674746..76bc15f1858 100644
--- a/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java
+++ b/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java
@@ -13,6 +13,7 @@
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@@ -46,16 +47,43 @@ public void testGetPaymentMethods() {
public void testCreatePaymentAccount(TestInfo testInfo) {
CreatePaymentAccountTest test = new CreatePaymentAccountTest();
+ test.testCreateAdvancedCashAccount(testInfo);
+ test.testCreateAliPayAccount(testInfo);
test.testCreateAustraliaPayidAccount(testInfo);
- test.testBrazilNationalBankAccountForm(testInfo);
- test.testChaseQuickPayAccountForm(testInfo);
- test.testClearXChangeAccountForm(testInfo);
- test.testF2FAccountForm(testInfo);
- test.testHalCashAccountForm(testInfo);
- test.testJapanBankAccountForm(testInfo);
- test.testSepaAccountForm(testInfo);
- test.testSwishAccountForm(testInfo);
- test.testUSPostalMoneyOrderAccountForm(testInfo);
+ test.testCreateCashDepositAccount(testInfo);
+ test.testCreateBrazilNationalBankAccount(testInfo);
+ test.testCreateChaseQuickPayAccount(testInfo);
+ test.testCreateClearXChangeAccount(testInfo);
+ test.testCreateF2FAccount(testInfo);
+ test.testCreateFasterPaymentsAccount(testInfo);
+ test.testCreateHalCashAccount(testInfo);
+ test.testCreateInteracETransferAccount(testInfo);
+ test.testCreateJapanBankAccount(testInfo);
+ test.testCreateMoneyBeamAccount(testInfo);
+ // test.testCreateMoneyGramAccount(testInfo);
+ test.testCreatePerfectMoneyAccount(testInfo);
+ test.testCreatePopmoneyAccount(testInfo);
+ test.testCreatePromptPayAccount(testInfo);
+ test.testCreateRevolutAccount(testInfo);
+ test.testCreateSameBankAccount(testInfo);
+ test.testCreateSepaInstantAccount(testInfo);
+ test.testCreateSepaAccount(testInfo);
+ test.testCreateSpecificBanksAccount(testInfo);
+ test.testCreateSwishAccount(testInfo);
+ test.testCreateTransferwiseAccount(testInfo);
+ test.testCreateUpholdAccount(testInfo);
+ test.testCreateUSPostalMoneyOrderAccount(testInfo);
+ test.testCreateWeChatPayAccount(testInfo);
+ test.testCreateWesternUnionAccount(testInfo);
+ }
+
+ @Test
+ @Order(3)
+ public void testTestNumSavedPaymentAccounts(TestInfo testInfo) {
+ // Two dummy (usd +eth) accounts are set up as defaults in regtest / dao mode,
+ // then we added more payment accounts in testCreatePaymentAccount().
+ int expectedNumPaymentAccounts = 2 + 27;
+ assertEquals(expectedNumPaymentAccounts, getPaymentAccounts(alicedaemon).size());
}
@AfterAll
From bb6762a23e410fdc2504b6320c48aeb98275be9f Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Fri, 20 Nov 2020 16:53:59 -0300
Subject: [PATCH 41/52] Reverse argument order for assert(expected, actual)
convention
---
.../payment/AbstractPaymentAccountTest.java | 3 +-
.../payment/CreatePaymentAccountTest.java | 47 +++++++++----------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java
index dfefd3d2828..14b145e0444 100644
--- a/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java
@@ -137,8 +137,7 @@ protected final void verifyCommonFormEntries(PaymentAccount paymentAccount) {
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NAME), paymentAccount.getAccountName());
}
- protected final void verifyAccountSingleTradeCurrency(PaymentAccount paymentAccount,
- String expectedCurrencyCode) {
+ protected final void verifyAccountSingleTradeCurrency(String expectedCurrencyCode, PaymentAccount paymentAccount) {
assertNotNull(paymentAccount.getSingleTradeCurrency());
assertEquals(expectedCurrencyCode, paymentAccount.getSingleTradeCurrency().getCode());
}
diff --git a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
index a861569405c..40ccb7b1022 100644
--- a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
@@ -116,7 +116,7 @@ public void testCreateAliPayAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
AliPayAccount paymentAccount = (AliPayAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "CNY");
+ verifyAccountSingleTradeCurrency("CNY", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
if (log.isDebugEnabled())
@@ -136,7 +136,7 @@ public void testCreateAustraliaPayidAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
AustraliaPayid paymentAccount = (AustraliaPayid) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "AUD");
+ verifyAccountSingleTradeCurrency("AUD", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_PAY_ID), paymentAccount.getPayid());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_ACCOUNT_NAME), paymentAccount.getBankAccountName());
@@ -144,7 +144,6 @@ public void testCreateAustraliaPayidAccount(TestInfo testInfo) {
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
-
@Test
public void testCreateCashDepositAccount(TestInfo testInfo) {
File emptyForm = getEmptyForm(testInfo, CASH_DEPOSIT_ID);
@@ -177,7 +176,7 @@ public void testCreateCashDepositAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
CashDepositAccount paymentAccount = (CashDepositAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
+ verifyAccountSingleTradeCurrency("EUR", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
@@ -223,7 +222,7 @@ public void testCreateBrazilNationalBankAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
NationalBankAccount paymentAccount = (NationalBankAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "BRL");
+ verifyAccountSingleTradeCurrency("BRL", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
@@ -255,7 +254,7 @@ public void testCreateChaseQuickPayAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
ChaseQuickPayAccount paymentAccount = (ChaseQuickPayAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency("USD", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
@@ -277,7 +276,7 @@ public void testCreateClearXChangeAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
ClearXchangeAccount paymentAccount = (ClearXchangeAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency("USD", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL_OR_MOBILE_NR), paymentAccount.getEmailOrMobileNr());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
@@ -303,7 +302,7 @@ public void testCreateF2FAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
F2FAccount paymentAccount = (F2FAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "BRL");
+ verifyAccountSingleTradeCurrency("BRL", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
@@ -328,7 +327,7 @@ public void testCreateFasterPaymentsAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
FasterPaymentsAccount paymentAccount = (FasterPaymentsAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "GBP");
+ verifyAccountSingleTradeCurrency("GBP", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_SORT_CODE), paymentAccount.getSortCode());
@@ -348,7 +347,7 @@ public void testCreateHalCashAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
HalCashAccount paymentAccount = (HalCashAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
+ verifyAccountSingleTradeCurrency("EUR", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_MOBILE_NR), paymentAccount.getMobileNr());
if (log.isDebugEnabled())
@@ -373,7 +372,7 @@ public void testCreateInteracETransferAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
InteracETransferAccount paymentAccount = (InteracETransferAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "CAD");
+ verifyAccountSingleTradeCurrency("CAD", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
@@ -407,7 +406,7 @@ public void testCreateJapanBankAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
JapanBankAccount paymentAccount = (JapanBankAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "JPY");
+ verifyAccountSingleTradeCurrency("JPY", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_CODE), paymentAccount.getBankCode());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_BANK_NAME), paymentAccount.getBankName());
@@ -432,7 +431,7 @@ public void testCreateMoneyBeamAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
MoneyBeamAccount paymentAccount = (MoneyBeamAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
+ verifyAccountSingleTradeCurrency("EUR", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_ID), paymentAccount.getAccountId());
if (log.isDebugEnabled())
@@ -485,7 +484,7 @@ public void testCreatePerfectMoneyAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
PerfectMoneyAccount paymentAccount = (PerfectMoneyAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency("USD", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
if (log.isDebugEnabled())
@@ -506,7 +505,7 @@ public void testCreatePopmoneyAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
PopmoneyAccount paymentAccount = (PopmoneyAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency("USD", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_ID), paymentAccount.getAccountId());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
@@ -526,7 +525,7 @@ public void testCreatePromptPayAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
PromptPayAccount paymentAccount = (PromptPayAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "THB");
+ verifyAccountSingleTradeCurrency("THB", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_PROMPT_PAY_ID), paymentAccount.getPromptPayId());
if (log.isDebugEnabled())
@@ -578,7 +577,7 @@ public void testCreateSameBankAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
SameBankAccount paymentAccount = (SameBankAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "GBP");
+ verifyAccountSingleTradeCurrency("GBP", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
@@ -616,7 +615,7 @@ public void testCreateSepaInstantAccount(TestInfo testInfo) {
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
- verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
+ verifyAccountSingleTradeCurrency("EUR", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_IBAN), paymentAccount.getIban());
@@ -647,7 +646,7 @@ public void testCreateSepaAccount(TestInfo testInfo) {
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
- verifyAccountSingleTradeCurrency(paymentAccount, "EUR");
+ verifyAccountSingleTradeCurrency("EUR", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_IBAN), paymentAccount.getIban());
@@ -687,7 +686,7 @@ public void testCreateSpecificBanksAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
SpecificBanksAccount paymentAccount = (SpecificBanksAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "GBP");
+ verifyAccountSingleTradeCurrency("GBP", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
Objects.requireNonNull(paymentAccount.getCountry()).code);
@@ -719,7 +718,7 @@ public void testCreateSwishAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
SwishAccount paymentAccount = (SwishAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "SEK");
+ verifyAccountSingleTradeCurrency("SEK", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_MOBILE_NR), paymentAccount.getMobileNr());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
@@ -779,7 +778,7 @@ public void testCreateUSPostalMoneyOrderAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
USPostalMoneyOrderAccount paymentAccount = (USPostalMoneyOrderAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency("USD", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getHolderName());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_POSTAL_ADDRESS), paymentAccount.getPostalAddress());
@@ -799,7 +798,7 @@ public void testCreateWeChatPayAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
WeChatPayAccount paymentAccount = (WeChatPayAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "CNY");
+ verifyAccountSingleTradeCurrency("CNY", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_ACCOUNT_NR), paymentAccount.getAccountNr());
if (log.isDebugEnabled())
@@ -826,7 +825,7 @@ public void testCreateWesternUnionAccount(TestInfo testInfo) {
String jsonString = getCompletedFormAsJsonString();
WesternUnionAccount paymentAccount = (WesternUnionAccount) createPaymentAccount(alicedaemon, jsonString);
verifyUserPayloadHasPaymentAccountWithId(paymentAccount.getId());
- verifyAccountSingleTradeCurrency(paymentAccount, "USD");
+ verifyAccountSingleTradeCurrency("USD", paymentAccount);
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getFullName());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_CITY), paymentAccount.getCity());
From 636fac9170e0ea90b4ba2b94a3705d8a0e6bd649 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sat, 21 Nov 2020 15:21:10 -0300
Subject: [PATCH 42/52] Add isMoneyGramAccount to abstract PaymentAccount
---
core/src/main/java/bisq/core/payment/PaymentAccount.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/src/main/java/bisq/core/payment/PaymentAccount.java b/core/src/main/java/bisq/core/payment/PaymentAccount.java
index f94811585f1..b61b86d482b 100644
--- a/core/src/main/java/bisq/core/payment/PaymentAccount.java
+++ b/core/src/main/java/bisq/core/payment/PaymentAccount.java
@@ -181,6 +181,10 @@ public boolean isHalCashAccount() {
return this instanceof HalCashAccount;
}
+ public boolean isMoneyGramAccount() {
+ return this instanceof MoneyGramAccount;
+ }
+
/**
* Return an Optional of the trade currency for this payment account, or
* Optional.empty() if none is found. If this payment account has a selected
From 23bfa2e7fc7948114e19dccbe41b307ee70a50d0 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sat, 21 Nov 2020 15:22:15 -0300
Subject: [PATCH 43/52] Refactor didReadCountryField to set country on
MoneyGram acct
MoneyGram is not a CountryBasedPaymentAccount, but it does
have a country field.
---
.../api/model/PaymentAccountTypeAdapter.java | 31 ++++++++++++-------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java b/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
index e60d5c722a7..13646d3f0d0 100644
--- a/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
+++ b/core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
@@ -21,6 +21,7 @@
import bisq.core.locale.Country;
import bisq.core.locale.FiatCurrency;
import bisq.core.payment.CountryBasedPaymentAccount;
+import bisq.core.payment.MoneyGramAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
@@ -285,22 +286,31 @@ private boolean didReadCommonField(JsonReader in, PaymentAccount account, String
}
private boolean didReadCountryField(JsonReader in, PaymentAccount account, String fieldName) {
- if (account.isCountryBasedPaymentAccount() && fieldName.equals("country")) {
- // Read the country code, and use it to set the account's country and single
- // trade currency fields.
- String countryCode = nextStringOrNull(in);
- Optional country = findCountryByCode(countryCode);
- if (country.isPresent()) {
+ if (!fieldName.equals("country"))
+ return false;
+
+ String countryCode = nextStringOrNull(in);
+ Optional country = findCountryByCode(countryCode);
+ if (country.isPresent()) {
+
+ if (account.isCountryBasedPaymentAccount()) {
((CountryBasedPaymentAccount) account).setCountry(country.get());
FiatCurrency fiatCurrency = getCurrencyByCountryCode(checkNotNull(countryCode));
account.setSingleTradeCurrency(fiatCurrency);
- return true;
+ } else if (account.isMoneyGramAccount()) {
+ ((MoneyGramAccount) account).setCountry(country.get());
} else {
- throw new IllegalArgumentException(
- format("'%s' is an invalid country code.", countryCode));
+ String errMsg = format("cannot set the country on a %s",
+ paymentAccountType.getSimpleName());
+ log.error(StringUtils.capitalize(errMsg) + ".");
+ throw new IllegalStateException("programmer error: " + errMsg);
}
+
+ return true;
+
} else {
- return false;
+ throw new IllegalArgumentException(
+ format("'%s' is an invalid country code.", countryCode));
}
}
@@ -315,7 +325,6 @@ private Class getPaymentAccountPayloadType() {
paymentAccountType.getSimpleName());
log.error(StringUtils.capitalize(errMsg) + ".", ex);
throw new IllegalStateException("programmer error: " + errMsg);
-
}
}
From 76097fc9dc1ec8f8bb7234db92d21d4abc40f762 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sat, 21 Nov 2020 15:24:33 -0300
Subject: [PATCH 44/52] Enable CreateMoneyGramAccount test
---
.../method/payment/CreatePaymentAccountTest.java | 9 ++-------
.../apitest/scenario/PaymentAccountTest.java | 16 ++++++----------
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
index 40ccb7b1022..5e1305b0c0c 100644
--- a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
@@ -438,14 +438,8 @@ public void testCreateMoneyBeamAccount(TestInfo testInfo) {
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
}
- @Disabled
@Test
public void testCreateMoneyGramAccount(TestInfo testInfo) {
- // TODO Check the MoneyGramAccount class, it seems it should be a subclass
- // of CountryBasedPaymentAccount, and these setters seem wrong:
- // setState(email)
- // setHolderName(email)
- // This is the only test that is breaking as of Fri 20 Nov 2020 03:18:34 PM -03.
File emptyForm = getEmptyForm(testInfo, MONEY_GRAM_ID);
verifyEmptyForm(emptyForm,
MONEY_GRAM_ID,
@@ -466,7 +460,8 @@ public void testCreateMoneyGramAccount(TestInfo testInfo) {
verifyCommonFormEntries(paymentAccount);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_HOLDER_NAME), paymentAccount.getFullName());
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_EMAIL), paymentAccount.getEmail());
- assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY), paymentAccount.getCountry());
+ assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_COUNTRY),
+ Objects.requireNonNull(paymentAccount.getCountry()).code);
assertEquals(COMPLETED_FORM_MAP.get(PROPERTY_NAME_STATE), paymentAccount.getState());
if (log.isDebugEnabled())
log.debug("Deserialized {}: {}", paymentAccount.getClass().getSimpleName(), paymentAccount);
diff --git a/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java
index 76bc15f1858..897e8bea3d0 100644
--- a/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java
+++ b/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java
@@ -26,6 +26,10 @@
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class PaymentAccountTest extends AbstractPaymentAccountTest {
+ // Two dummy (usd +eth) accounts are set up as defaults in regtest / dao mode,
+ // then we add 28 more payment accounts in testCreatePaymentAccount().
+ private static final int EXPECTED_NUM_PAYMENT_ACCOUNTS = 2 + 28;
+
@BeforeAll
public static void setUp() {
try {
@@ -60,7 +64,7 @@ public void testCreatePaymentAccount(TestInfo testInfo) {
test.testCreateInteracETransferAccount(testInfo);
test.testCreateJapanBankAccount(testInfo);
test.testCreateMoneyBeamAccount(testInfo);
- // test.testCreateMoneyGramAccount(testInfo);
+ test.testCreateMoneyGramAccount(testInfo);
test.testCreatePerfectMoneyAccount(testInfo);
test.testCreatePopmoneyAccount(testInfo);
test.testCreatePromptPayAccount(testInfo);
@@ -75,20 +79,12 @@ public void testCreatePaymentAccount(TestInfo testInfo) {
test.testCreateUSPostalMoneyOrderAccount(testInfo);
test.testCreateWeChatPayAccount(testInfo);
test.testCreateWesternUnionAccount(testInfo);
- }
- @Test
- @Order(3)
- public void testTestNumSavedPaymentAccounts(TestInfo testInfo) {
- // Two dummy (usd +eth) accounts are set up as defaults in regtest / dao mode,
- // then we added more payment accounts in testCreatePaymentAccount().
- int expectedNumPaymentAccounts = 2 + 27;
- assertEquals(expectedNumPaymentAccounts, getPaymentAccounts(alicedaemon).size());
+ assertEquals(EXPECTED_NUM_PAYMENT_ACCOUNTS, getPaymentAccounts(alicedaemon).size());
}
@AfterAll
public static void tearDown() {
tearDownScaffold();
}
-
}
From 424f9480ade352f6e79378fe79f84580c357a555 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sun, 22 Nov 2020 16:12:34 -0300
Subject: [PATCH 45/52] Fix broken tests
- Change the getbalance tests to just check a sucessful '0' status code.
The api's getbalance method returns full balance info now, not just a
formatted long. We still assert the cmd did not fail, but don't check
the value string.
- Remove obsolete createpaymentacct tests.
This is well tested in apitest, and testing this cmd is unnecesarily
complex to do in a bats script.
---
apitest/scripts/mainnet-test.sh | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/apitest/scripts/mainnet-test.sh b/apitest/scripts/mainnet-test.sh
index 72b29cdfbf3..2cb436dbf1c 100755
--- a/apitest/scripts/mainnet-test.sh
+++ b/apitest/scripts/mainnet-test.sh
@@ -93,8 +93,6 @@
@test "test getbalance while wallet unlocked for 8s" {
run ./bisq-cli --password=xyz getbalance
[ "$status" -eq 0 ]
- echo "actual output: $output" >&2
- [ "$output" = "0.00000000" ]
sleep 8
}
@@ -145,8 +143,6 @@
@test "test getbalance when wallet available & unlocked with 0 btc balance" {
run ./bisq-cli --password=xyz getbalance
[ "$status" -eq 0 ]
- echo "actual output: $output" >&2
- [ "$output" = "0.00000000" ]
}
@test "test getfundingaddresses" {
@@ -168,18 +164,6 @@
[ "$output" = "Error: address bogus not found in wallet" ]
}
-@test "test createpaymentacct PerfectMoneyDummy (missing name, nbr, ccy params)" {
- run ./bisq-cli --password=xyz createpaymentacct PERFECT_MONEY
- [ "$status" -eq 1 ]
- echo "actual output: $output" >&2
- [ "$output" = "Error: incorrect parameter count, expecting payment method id, account name, account number, currency code" ]
-}
-
-@test "test createpaymentacct PERFECT_MONEY PerfectMoneyDummy 0123456789 USD" {
- run ./bisq-cli --password=xyz createpaymentacct PERFECT_MONEY PerfectMoneyDummy 0123456789 USD
- [ "$status" -eq 0 ]
-}
-
@test "test getpaymentaccts" {
run ./bisq-cli --password=xyz getpaymentaccts
[ "$status" -eq 0 ]
From daeb34b3d28c6118a904d53a917a37acbfe91938 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sun, 22 Nov 2020 16:25:21 -0300
Subject: [PATCH 46/52] Add two new api method tests
Keeping the bats test simple. More complex use cases are tested in
apitest, and we don't want to be trading on mainnet with a bats test.
- Add new getunusedbsqaddress test, assert success return status.
- Add new getpaymentmethods test, assert success return status.
---
apitest/scripts/mainnet-test.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/apitest/scripts/mainnet-test.sh b/apitest/scripts/mainnet-test.sh
index 2cb436dbf1c..48fe4023bf1 100755
--- a/apitest/scripts/mainnet-test.sh
+++ b/apitest/scripts/mainnet-test.sh
@@ -150,6 +150,11 @@
[ "$status" -eq 0 ]
}
+@test "test getunusedbsqaddress" {
+ run ./bisq-cli --password=xyz getfundingaddresses
+ [ "$status" -eq 0 ]
+}
+
@test "test getaddressbalance missing address argument" {
run ./bisq-cli --password=xyz getaddressbalance
[ "$status" -eq 1 ]
@@ -164,6 +169,11 @@
[ "$output" = "Error: address bogus not found in wallet" ]
}
+@test "test getpaymentmethods" {
+ run ./bisq-cli --password=xyz getpaymentmethods
+ [ "$status" -eq 0 ]
+}
+
@test "test getpaymentaccts" {
run ./bisq-cli --password=xyz getpaymentaccts
[ "$status" -eq 0 ]
From 08d56733a864332e0f66cb4d01721214a8b1c4e3 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sun, 22 Nov 2020 16:54:24 -0300
Subject: [PATCH 47/52] Fix getbalance out bug in CLI
Running the bats test exposed a bug that shows BSQ and BTC balance
info no matter what currency code argument is passed to the server.
---
cli/src/main/java/bisq/cli/CliMain.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/bisq/cli/CliMain.java
index f3d2b806ada..48493eebaac 100644
--- a/cli/src/main/java/bisq/cli/CliMain.java
+++ b/cli/src/main/java/bisq/cli/CliMain.java
@@ -69,10 +69,7 @@
import static bisq.cli.CurrencyFormat.toSatoshis;
import static bisq.cli.NegativeNumberOptions.hasNegativeNumberOptions;
-import static bisq.cli.TableFormat.formatAddressBalanceTbl;
-import static bisq.cli.TableFormat.formatBalancesTbls;
-import static bisq.cli.TableFormat.formatOfferTable;
-import static bisq.cli.TableFormat.formatPaymentAcctTbl;
+import static bisq.cli.TableFormat.*;
import static java.lang.String.format;
import static java.lang.System.err;
import static java.lang.System.exit;
@@ -208,7 +205,18 @@ public static void run(String[] args) {
.setCurrencyCode(currencyCode)
.build();
var reply = walletsService.getBalances(request);
- out.println(formatBalancesTbls(reply.getBalances()));
+ switch (currencyCode.toUpperCase()) {
+ case "BSQ":
+ out.println(formatBsqBalanceInfoTbl(reply.getBalances().getBsq()));
+ break;
+ case "BTC":
+ out.println(formatBtcBalanceInfoTbl(reply.getBalances().getBtc()));
+ break;
+ case "":
+ default:
+ out.println(formatBalancesTbls(reply.getBalances()));
+ break;
+ }
return;
}
case getaddressbalance: {
From ab5780e0e105d3b00b0dcd91394e33f1c6368c04 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sun, 22 Nov 2020 18:58:43 -0300
Subject: [PATCH 48/52] Print 'no offers found' msg in CLI if list is empty
---
cli/src/main/java/bisq/cli/CliMain.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/bisq/cli/CliMain.java
index 48493eebaac..69f6be5a7a7 100644
--- a/cli/src/main/java/bisq/cli/CliMain.java
+++ b/cli/src/main/java/bisq/cli/CliMain.java
@@ -35,6 +35,7 @@
import bisq.proto.grpc.GetVersionRequest;
import bisq.proto.grpc.KeepFundsRequest;
import bisq.proto.grpc.LockWalletRequest;
+import bisq.proto.grpc.OfferInfo;
import bisq.proto.grpc.RegisterDisputeAgentRequest;
import bisq.proto.grpc.RemoveWalletPasswordRequest;
import bisq.proto.grpc.SendBsqRequest;
@@ -344,7 +345,13 @@ public static void run(String[] args) {
.setCurrencyCode(currencyCode)
.build();
var reply = offersService.getOffers(request);
- out.println(formatOfferTable(reply.getOffersList(), currencyCode));
+
+ List offers = reply.getOffersList();
+ if(offers.isEmpty())
+ out.println("no offers found");
+ else
+ out.println(formatOfferTable(reply.getOffersList(), currencyCode));
+
return;
}
case takeoffer: {
From c88543848d7d553df18afc4d2ccd10ff009075af Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Mon, 23 Nov 2020 12:06:57 -0300
Subject: [PATCH 49/52] Fix minor error & help msg bugs
---
cli/src/main/java/bisq/cli/CliMain.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/bisq/cli/CliMain.java
index 69f6be5a7a7..c6a420253cc 100644
--- a/cli/src/main/java/bisq/cli/CliMain.java
+++ b/cli/src/main/java/bisq/cli/CliMain.java
@@ -347,8 +347,8 @@ public static void run(String[] args) {
var reply = offersService.getOffers(request);
List offers = reply.getOffersList();
- if(offers.isEmpty())
- out.println("no offers found");
+ if (offers.isEmpty())
+ out.printf("no %s %s offers found\n", direction, currencyCode);
else
out.println(formatOfferTable(reply.getOffersList(), currencyCode));
@@ -627,8 +627,8 @@ private static void printHelp(OptionParser parser, PrintStream stream) {
stream.format(rowFormat, "sendbsq", "address, amount", "Send BSQ");
stream.format(rowFormat, "createoffer", "payment acct id, buy | sell, currency code, \\", "Create and place an offer");
stream.format(rowFormat, "", "amount (btc), min amount, use mkt based price, \\", "");
- stream.format(rowFormat, "", "fixed price (btc) | mkt price margin (%) [,maker fee currency code = bsq|btc]\\", "");
- stream.format(rowFormat, "", "security deposit (%)", "");
+ stream.format(rowFormat, "", "fixed price (btc) | mkt price margin (%), security deposit (%) \\", "");
+ stream.format(rowFormat, "", "[,maker fee currency code = bsq|btc]", "");
stream.format(rowFormat, "canceloffer", "offer id", "Cancel offer with id");
stream.format(rowFormat, "getoffer", "offer id", "Get current offer with id");
stream.format(rowFormat, "getoffers", "buy | sell, currency code", "Get current offers");
From f50634ee4a4fe22c9209727f4c78fe4c0a29a1df Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Thu, 26 Nov 2020 13:34:05 -0300
Subject: [PATCH 50/52] Resolve BsqSendView file conflict
Restore BsqSendView to version @ commit 48a515be01dd674d241be04cddb18c0e823e91b4.
Author: jmacxx
Date: Tue Nov 10 19:35:31 2020 -0600
Add encrypted wallet password prompt when sending funds from BSQ wallet
Correct wording of transaction confirmation popup to use 'mining fee'
instead of 'transaction fee' to make it consistent with wording of
the BTC confirmation popup.
---
.../main/dao/wallet/send/BsqSendView.java | 41 +++++++------------
1 file changed, 15 insertions(+), 26 deletions(-)
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java b/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
index c3dee6eb0e4..fa638c4a19c 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
@@ -35,13 +35,9 @@
import bisq.desktop.util.validation.BtcValidator;
import bisq.core.btc.exceptions.BsqChangeBelowDustException;
-import bisq.core.btc.exceptions.TransactionVerificationException;
import bisq.core.btc.exceptions.TxBroadcastException;
-import bisq.core.btc.exceptions.WalletException;
import bisq.core.btc.listeners.BsqBalanceListener;
-import bisq.core.btc.model.BsqTransferModel;
import bisq.core.btc.setup.WalletsSetup;
-import bisq.core.btc.wallet.BsqTransferService;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.Restrictions;
@@ -50,10 +46,10 @@
import bisq.core.dao.state.model.blockchain.TxType;
import bisq.core.locale.Res;
import bisq.core.util.FormattingUtils;
-import bisq.core.util.ParsingUtils;
import bisq.core.util.coin.BsqFormatter;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.coin.CoinUtil;
+import bisq.core.util.ParsingUtils;
import bisq.core.util.validation.BtcAddressValidator;
import bisq.network.p2p.P2PService;
@@ -63,7 +59,6 @@
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.InsufficientMoneyException;
-import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.Transaction;
import javax.inject.Inject;
@@ -95,7 +90,6 @@ public class BsqSendView extends ActivatableView implements BsqB
private final BtcValidator btcValidator;
private final BsqAddressValidator bsqAddressValidator;
private final BtcAddressValidator btcAddressValidator;
- private final BsqTransferService bsqTransferService;
private final WalletPasswordWindow walletPasswordWindow;
private int gridRow = 0;
@@ -125,7 +119,6 @@ private BsqSendView(BsqWalletService bsqWalletService,
BtcValidator btcValidator,
BsqAddressValidator bsqAddressValidator,
BtcAddressValidator btcAddressValidator,
- BsqTransferService bsqTransferService,
WalletPasswordWindow walletPasswordWindow) {
this.bsqWalletService = bsqWalletService;
this.btcWalletService = btcWalletService;
@@ -140,7 +133,6 @@ private BsqSendView(BsqWalletService bsqWalletService,
this.btcValidator = btcValidator;
this.bsqAddressValidator = bsqAddressValidator;
this.btcAddressValidator = btcAddressValidator;
- this.bsqTransferService = bsqTransferService;
this.walletPasswordWindow = walletPasswordWindow;
}
@@ -249,15 +241,22 @@ private void addSendBsqGroup() {
sendBsqButton = addButtonAfterGroup(root, ++gridRow, Res.get("dao.wallet.send.send"));
sendBsqButton.setOnAction((event) -> {
+ // TODO break up in methods
if (GUIUtil.isReadyForTxBroadcastOrShowPopup(p2PService, walletsSetup)) {
+ String receiversAddressString = bsqFormatter.getAddressFromBsqAddress(receiversAddressInputTextField.getText()).toString();
+ Coin receiverAmount = ParsingUtils.parseToCoin(amountInputTextField.getText(), bsqFormatter);
try {
- BsqTransferModel model = getBsqTransferModel();
- showPublishTxPopup(model.getReceiverAmount(),
- model.getTxWithBtcFee(),
- model.getTxType(),
- model.getMiningFee(),
- model.getTxSize(),
- model.getReceiverAddressAsString(),
+ Transaction preparedSendTx = bsqWalletService.getPreparedSendBsqTx(receiversAddressString, receiverAmount);
+ Transaction txWithBtcFee = btcWalletService.completePreparedSendBsqTx(preparedSendTx, true);
+ Transaction signedTx = bsqWalletService.signTx(txWithBtcFee);
+ Coin miningFee = signedTx.getFee();
+ int txSize = signedTx.bitcoinSerialize().length;
+ showPublishTxPopup(receiverAmount,
+ txWithBtcFee,
+ TxType.TRANSFER_BSQ,
+ miningFee,
+ txSize,
+ receiversAddressInputTextField.getText(),
bsqFormatter,
btcFormatter,
() -> {
@@ -274,16 +273,6 @@ private void addSendBsqGroup() {
});
}
- private BsqTransferModel getBsqTransferModel()
- throws InsufficientMoneyException,
- TransactionVerificationException,
- BsqChangeBelowDustException,
- WalletException {
- Coin receiverAmount = ParsingUtils.parseToCoin(amountInputTextField.getText(), bsqFormatter);
- LegacyAddress legacyAddress = bsqFormatter.getAddressFromBsqAddress(receiversAddressInputTextField.getText());
- return bsqTransferService.getBsqTransferModel(legacyAddress, receiverAmount);
- }
-
private void setSendBtcGroupVisibleState(boolean visible) {
btcTitledGroupBg.setVisible(visible);
receiversBtcAddressInputTextField.setVisible(visible);
From 904352ee2ed8101c3b9742b177745b823484ca81 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Thu, 26 Nov 2020 16:50:53 -0300
Subject: [PATCH 51/52] Adjust to changed CoinUtil
---
core/src/main/java/bisq/core/btc/model/BsqTransferModel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/main/java/bisq/core/btc/model/BsqTransferModel.java b/core/src/main/java/bisq/core/btc/model/BsqTransferModel.java
index 3033c769eee..38e4c4b5423 100644
--- a/core/src/main/java/bisq/core/btc/model/BsqTransferModel.java
+++ b/core/src/main/java/bisq/core/btc/model/BsqTransferModel.java
@@ -41,7 +41,7 @@ public String getReceiverAddressAsString() {
}
public double getMiningFeeInSatoshisPerByte() {
- return CoinUtil.getFeePerByte(miningFee, txSize);
+ return CoinUtil.getFeePerVbyte(miningFee, txSize);
}
public double getTxSizeInKb() {
From a1c5dd5aebb7f02a58430ab7f9941ec45ee9cfd4 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Thu, 26 Nov 2020 16:53:27 -0300
Subject: [PATCH 52/52] Adjust test for a new payment method
---
.../java/bisq/apitest/method/payment/GetPaymentMethodsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java b/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java
index 50c5d5b61cd..52ff85b7f49 100644
--- a/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java
@@ -43,7 +43,7 @@ public void testGetPaymentMethods() {
.stream()
.map(p -> p.getId())
.collect(Collectors.toList());
- assertEquals(28, paymentMethodIds.size());
+ assertEquals(29, paymentMethodIds.size());
}
@AfterAll