merchant

commit e0c0cfd6f3b1ef5287a413ffd9aa361be5d4b0ea
parent 45c08275667af27f5ff1a32a059521b67db37b3a
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 13 Aug 2021 22:28:18 +0200

-do merge updates for exchange 0.8.3

Diffstat:
M
src/backenddb/merchant-0001.sql
 | 
2
+-
M
src/lib/merchant_api_wallet_get_order.c
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backenddb/merchant-0001.sql b/src/backenddb/merchant-0001.sql
@@ -99,7 +99,7 @@ CREATE TABLE IF NOT EXISTS merchant_accounts
   ,h_wire BYTEA NOT NULL CHECK (LENGTH(h_wire)=64)
   ,salt BYTEA NOT NULL CHECK (LENGTH(salt)=64)
   ,payto_uri VARCHAR NOT NULL
-  ,active boolean NOT NULL
+  ,active BOOLEAN NOT NULL
   ,UNIQUE (merchant_serial,payto_uri)
   ,UNIQUE (h_wire)
   );
diff --git a/src/lib/merchant_api_wallet_get_order.c b/src/lib/merchant_api_wallet_get_order.c
@@ -123,7 +123,7 @@ handle_wallet_get_order_finished (void *cls,
         GNUNET_JSON_spec_bool ("refund_pending",
                                &refund_pending),
         TALER_JSON_spec_amount_any ("refund_amount",
-                                &refund_amount),
+                                    &refund_amount),
         GNUNET_JSON_spec_end ()
       };
       struct TALER_MERCHANT_HttpResponse hr = {