[taler-merchant] 08/24: get backenddb test to pass

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

commit e5096a1efbe27caa3802372046f06175cae24f69
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Tue Nov 2 23:47:39 2021 +0100

    get backenddb test to pass
---
 contrib/merchant-backoffice     |  2 +-
 src/backenddb/drop0001.sql      | 24 ++++++++++++------------
 src/backenddb/merchant-0001.sql |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 824aa7a8..182cdfff 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 824aa7a80b4c2e63d23985751f34c9492d396a36
+Subproject commit 182cdfffa1d4b6f2bb3543d30cfa7509e73bda03
diff --git a/src/backenddb/drop0001.sql b/src/backenddb/drop0001.sql
index 4a028bab..d7171e9d 100644
--- a/src/backenddb/drop0001.sql
+++ b/src/backenddb/drop0001.sql
@@ -23,6 +23,18 @@ BEGIN;
 -- Unlike the other SQL files, it SHOULD be updated to reflect the
 -- latest requirements for dropping tables.
 
+-- Unregister patch (0003.sql)
+SELECT _v.unregister_patch('merchant-0003');
+
+-- Unregister patch (0002.sql)
+SELECT _v.unregister_patch('merchant-0002');
+
+-- Unregister patch (0001.sql)
+SELECT _v.unregister_patch('merchant-0001');
+
+
+DROP TABLE IF EXISTS merchant_kyc CASCADE;
+
 -- Drops for 0001.sql
 
 DROP TABLE IF EXISTS merchant_exchange_wire_fees CASCADE;
@@ -51,18 +63,6 @@ DROP TABLE IF EXISTS merchant_tips CASCADE;
 DROP TABLE IF EXISTS merchant_tip_pickups CASCADE;
 DROP TABLE IF EXISTS merchant_tip_pickup_signatures CASCADE;
 
--- Unregister patch (0001.sql)
-SELECT _v.unregister_patch('merchant-0001');
-
--- Unregister patch (0002.sql)
-SELECT _v.unregister_patch('merchant-0002');
-
-DROP TABLE IF EXISTS merchant_kyc CASCADE;
-
--- Unregister patch (0003.sql)
-SELECT _v.unregister_patch('merchant-0003');
-
-
 
 -- And we're out of here...
 COMMIT;
diff --git a/src/backenddb/merchant-0001.sql b/src/backenddb/merchant-0001.sql
index 9e769067..a4058a8a 100644
--- a/src/backenddb/merchant-0001.sql
+++ b/src/backenddb/merchant-0001.sql
@@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS merchant_accounts
   ,merchant_serial BIGINT NOT NULL
      REFERENCES merchant_instances (merchant_serial) ON DELETE CASCADE
   ,h_wire BYTEA NOT NULL CHECK (LENGTH(h_wire)=64)
-  ,salt BYTEA NOT NULL CHECK (LENGTH(salt)=64) -- FIXME: eventually migrate to 
16-bit salt value here! #7032
+  ,salt BYTEA NOT NULL CHECK (LENGTH(salt)=16) 
   ,payto_uri VARCHAR NOT NULL
   ,active BOOLEAN NOT NULL
   ,UNIQUE (merchant_serial,payto_uri)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.