Merge pull request #4705 from ghubstan/8-gettrade-json-option

Optionally print the json contract for a given trade id
bisq-network · Oct 30, 2020 · 6079a96 · 6079a96
2 parents e059342 + a2b2923
commit 6079a96
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/bisq/cli/CliMain.java
@@ -279,14 +279,21 @@ public static void run(String[] args) {
                 }
                 case gettrade: {
                     if (nonOptionArgs.size() < 2)
-                        throw new IllegalArgumentException("incorrect parameter count, expecting trade id");
+                        throw new IllegalArgumentException("incorrect parameter count, expecting trade id, [,showcontract = true|false]");
 
                     var tradeId = nonOptionArgs.get(1);
+                    var showContract = false;
+                    if (nonOptionArgs.size() == 3)
+                        showContract = Boolean.getBoolean(nonOptionArgs.get(2));
+
                     var request = GetTradeRequest.newBuilder()
                             .setTradeId(tradeId)
                             .build();
                     var reply = tradesService.getTrade(request);
-                    out.println(TradeFormat.format(reply.getTrade()));
+                    if (showContract)
+                        out.println(reply.getTrade().getContractAsJson());
+                    else
+                        out.println(TradeFormat.format(reply.getTrade()));
                     return;
                 }
                 case confirmpaymentstarted: {
@@ -441,7 +448,7 @@ private static void printHelp(OptionParser parser, PrintStream stream) {
             stream.format(rowFormat, "getoffer", "offer id", "Get current offer with id");
             stream.format(rowFormat, "getoffers", "buy | sell, currency code", "Get current offers");
             stream.format(rowFormat, "takeoffer", "offer id", "Take offer with id");
-            stream.format(rowFormat, "gettrade", "trade id", "Get trade details and protocol status");
+            stream.format(rowFormat, "gettrade", "trade id [,showcontract]", "Get trade summary or full contract");
             stream.format(rowFormat, "confirmpaymentstarted", "trade id", "Confirm payment started");
             stream.format(rowFormat, "confirmpaymentreceived", "trade id", "Confirm payment received");
             stream.format(rowFormat, "createpaymentacct", "account name, account number, currency code", "Create PerfectMoney dummy account");