[taler-anastasis] branch master updated: Worked on errors

[gnunet]

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

dennis-neufeld pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new ffb0d45  Worked on errors
ffb0d45 is described below

commit ffb0d45255c7964369fc06a42bdae2016cb05a6f
Author: Dennis Neufeld <address@hidden>
AuthorDate: Wed Nov 6 21:14:08 2019 +0000

    Worked on errors
---
 src/backup-db/plugin_anastasis_postgres.c | 19 ++++++++++---------
 src/backup-db/test_anastasis_db.c         |  6 +++---
 src/backup/Makefile.am                    |  2 +-
 src/lib/Makefile.am                       |  1 +
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/backup-db/plugin_anastasis_postgres.c 
b/src/backup-db/plugin_anastasis_postgres.c
index 95a1de2..f4bce5c 100644
--- a/src/backup-db/plugin_anastasis_postgres.c
+++ b/src/backup-db/plugin_anastasis_postgres.c
@@ -232,7 +232,7 @@ postgres_store_recovery_document (void *cls,
                                   const struct
                                   ANASTASIS_PaymentSecretP *payment_secret,
                                   uint32_t *version)
-{ 
+{
   struct PostgresClosure *pg = cls;
   enum ANASTASIS_DB_QueryStatus qs;
   uint32_t postcounter;
@@ -245,7 +245,7 @@ postgres_store_recovery_document (void *cls,
     GNUNET_break (0);
     return ANASTASIS_DB_STATUS_HARD_ERROR;
   }
-  
+
   /* Check if user has paid */
   {
     struct GNUNET_PQ_QueryParam params[] = {
@@ -263,7 +263,7 @@ postgres_store_recovery_document (void *cls,
                                                    params,
                                                    rs);
   }
-  
+
   struct GNUNET_TIME_Relative time_remaining;
 
   switch (qs)
@@ -863,12 +863,13 @@ libanastasis_plugin_db_postgres_init (void *cls)
                             "  payment_identifier BYTEA NOT NULL 
CHECK(LENGTH(payment_identifier)=32),"
                             "  transaction_time TIMESTAMP NOT NULL DEFAULT 
NOW()"
                             ");"),
-    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS 
anastasis_recoverydocument"
-                            "( user_id BYTEA NOT NULL REFERENCES 
anastasis_user(user_id),"
-                            "  version INTEGER NOT NULL,"
-                            "  recovery_data BYTEA NOT NULL,"
-                            "  PRIMARY KEY (user_id, version)"
-                            ");"),
+    GNUNET_PQ_make_execute (
+      "CREATE TABLE IF NOT EXISTS anastasis_recoverydocument"
+      "( user_id BYTEA NOT NULL REFERENCES anastasis_user(user_id),"
+      "  version INTEGER NOT NULL,"
+      "  recovery_data BYTEA NOT NULL,"
+      "  PRIMARY KEY (user_id, version)"
+      ");"),
     GNUNET_PQ_EXECUTE_STATEMENT_END
   };
   struct GNUNET_PQ_PreparedStatement ps[] = {
diff --git a/src/backup-db/test_anastasis_db.c 
b/src/backup-db/test_anastasis_db.c
index 3f06bf2..fc56de4 100644
--- a/src/backup-db/test_anastasis_db.c
+++ b/src/backup-db/test_anastasis_db.c
@@ -170,7 +170,7 @@ run (void *cls)
   }
 
   uint32_t recversion = 1;
-  
+
   RND_BLK (&accountPubP);
 
   int rec_val = 100;
@@ -200,7 +200,7 @@ run (void *cls)
                                   &accountPubP,
                                   post_counter,
                                   rel_time,
-                                  &paymentSecretP));   
+                                  &paymentSecretP));
 
   FAILIF (ANASTASIS_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->store_recovery_document (plugin->cls,
@@ -208,7 +208,7 @@ run (void *cls)
                                            &recovery_data,
                                            sizeof (&recovery_data),
                                            &paymentSecretP,
-                                           version));  
+                                           version));
 
   FAILIF (ANASTASIS_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->store_truth (plugin->cls,
diff --git a/src/backup/Makefile.am b/src/backup/Makefile.am
index 88e56b5..41be385 100644
--- a/src/backup/Makefile.am
+++ b/src/backup/Makefile.am
@@ -13,7 +13,7 @@ bin_PROGRAMS = \
   anastasis-httpd
 
 anastasis_httpd_SOURCES = \
-  anastasis-httpd.c taler-merchant-httpd.h \
+  anastasis-httpd.c anastasis-httpd.h \
   anastasis-httpd_parsing.c anastasis-httpd_parsing.h \
   anastasis-httpd_responses.c anastasis-httpd_responses.h \
   anastasis-httpd_mhd.c anastasis-httpd_mhd.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 813214f..477a0a5 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -17,6 +17,7 @@ libanastasis_la_SOURCES = \
   anastasis_api_salt.c
 
 libanastasis_la_LIBADD = \
+  -lmicrohttpd \
   -lgnunetcurl \
   -lgnunetjson \
   -lgnunetutil \

-- 
To stop receiving notification emails like this one, please contact
address@hidden.