diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-08-13 22:28:18 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-08-13 22:28:27 +0200 |
| commit | e0c0cfd6f3b1ef5287a413ffd9aa361be5d4b0ea (patch) | |
| tree | d95c1c5c975156ea559a8b010a197bfe4e63f30e | |
| parent | 45c08275667af27f5ff1a32a059521b67db37b3a (diff) | |
| download | merchant-e0c0cfd6f3b1ef5287a413ffd9aa361be5d4b0ea.tar.gz merchant-e0c0cfd6f3b1ef5287a413ffd9aa361be5d4b0ea.tar.bz2 merchant-e0c0cfd6f3b1ef5287a413ffd9aa361be5d4b0ea.zip | |
-do merge updates for exchange 0.8.3v0.8.1
| -rw-r--r-- | src/backenddb/merchant-0001.sql | 2 | ||||
| -rw-r--r-- | 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 index 65ea94c9..ed728ab6 100644 --- 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 index 08a91ef7..06806e0f 100644 --- 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 = { |