[taler-anastasis] branch master updated: Fixed fun for dennis. Still strange error with launching taler-exchange-httpd...

[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 ce9695b  Fixed fun for dennis. Still strange error with launching 
taler-exchange-httpd...
ce9695b is described below

commit ce9695b2e0e9b6874e45bc2d96701d4e6467ca72
Author: Dennis Neufeld <address@hidden>
AuthorDate: Fri Dec 13 06:16:02 2019 +0000

    Fixed fun for dennis. Still strange error with launching 
taler-exchange-httpd...
---
 src/backend/anastasis-httpd_policy.c   |  1 -
 src/stasis/plugin_anastasis_postgres.c | 13 ++-----------
 src/stasis/test_anastasis_db.c         | 15 ---------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/backend/anastasis-httpd_policy.c 
b/src/backend/anastasis-httpd_policy.c
index 1c740f7..ecfde0e 100644
--- a/src/backend/anastasis-httpd_policy.c
+++ b/src/backend/anastasis-httpd_policy.c
@@ -167,7 +167,6 @@ AH_handler_policy_GET (struct MHD_Connection *connection,
   void *res_recovery_data;
   size_t res_recovery_data_size;
   struct ANASTASIS_AccountSignatureP account_sig;
-  struct GNUNET_HashCode prev_hash;
   struct GNUNET_HashCode recovery_data_hash;
   const char *version_s;
   uint32_t version;
diff --git a/src/stasis/plugin_anastasis_postgres.c 
b/src/stasis/plugin_anastasis_postgres.c
index 2fdeadb..3d01981 100644
--- a/src/stasis/plugin_anastasis_postgres.c
+++ b/src/stasis/plugin_anastasis_postgres.c
@@ -512,7 +512,6 @@ postgres_store_recovery_document (void *cls,
       GNUNET_PQ_query_param_auto_from_type (anastasis_pub),
       GNUNET_PQ_query_param_uint32 (version),
       GNUNET_PQ_query_param_auto_from_type (account_sig),
-      GNUNET_PQ_query_param_auto_from_type (old_recovery_data_hash),
       GNUNET_PQ_query_param_auto_from_type (recovery_data_hash),
       GNUNET_PQ_query_param_fixed_size (recovery_data,
                                         recovery_data_size),
@@ -941,8 +940,6 @@ postgres_get_latest_recovery_document (void *cls,
                                   version),
     GNUNET_PQ_result_spec_auto_from_type ("account_sig",
                                           account_sig),
-    GNUNET_PQ_result_spec_auto_from_type ("prev_hash",
-                                          prev_hash),
     GNUNET_PQ_result_spec_auto_from_type ("recovery_data_hash",
                                           recovery_data_hash),
     GNUNET_PQ_result_spec_variable_size ("recovery_data",
@@ -1010,8 +1007,6 @@ postgres_get_recovery_document (void *cls,
   struct GNUNET_PQ_ResultSpec rs[] = {
     GNUNET_PQ_result_spec_auto_from_type ("account_sig",
                                           account_sig),
-    GNUNET_PQ_result_spec_auto_from_type ("prev_hash",
-                                          prev_hash),
     GNUNET_PQ_result_spec_auto_from_type ("recovery_data_hash",
                                           recovery_data_hash),
     GNUNET_PQ_result_spec_variable_size ("recovery_data",
@@ -1082,7 +1077,6 @@ libanastasis_plugin_db_postgres_init (void *cls)
       "( user_id BYTEA NOT NULL REFERENCES anastasis_user(user_id),"
       " version INT4 NOT NULL,"
       " account_sig BYTEA NOT NULL CHECK(LENGTH(account_sig)=64),"
-      " prev_hash BYTEA NOT NULL CHECK(LENGTH(prev_hash)=64),"
       " recovery_data_hash BYTEA NOT NULL 
CHECK(length(recovery_data_hash)=64),"
       " recovery_data BYTEA NOT NULL,"
       " PRIMARY KEY (user_id, version)"
@@ -1137,12 +1131,11 @@ libanastasis_plugin_db_postgres_init (void *cls)
                             "(user_id"
                             ",version"
                             ",account_sig"
-                            ",prev_hash"
                             ",recovery_data_hash"
                             ",recovery_data"
                             ") VALUES "
-                            "($1, $2, $3, $4, $5, $6);",
-                            6),
+                            "($1, $2, $3, $4, $5);",
+                            5),
     GNUNET_PQ_make_prepare ("truth_select",
                             "SELECT "
                             "truth,"
@@ -1154,7 +1147,6 @@ libanastasis_plugin_db_postgres_init (void *cls)
                             "SELECT "
                             " version"
                             ",account_sig"
-                            ",prev_hash"
                             ",recovery_data_hash"
                             ",recovery_data"
                             " FROM anastasis_recoverydocument"
@@ -1173,7 +1165,6 @@ libanastasis_plugin_db_postgres_init (void *cls)
     GNUNET_PQ_make_prepare ("recoverydocument_select",
                             "SELECT "
                             " account_sig"
-                            ",prev_hash"
                             ",recovery_data_hash"
                             ",recovery_data"
                             " FROM anastasis_recoverydocument"
diff --git a/src/stasis/test_anastasis_db.c b/src/stasis/test_anastasis_db.c
index 842cc64..c168f2c 100644
--- a/src/stasis/test_anastasis_db.c
+++ b/src/stasis/test_anastasis_db.c
@@ -76,23 +76,11 @@ static struct ANASTASIS_AccountSignatureP accountSig;
  */
 struct ANASTASIS_AccountSignatureP res_account_sig;
 
-/**
- * Hash of the previous uploaded recovery doucument
- * (normally the latest version stored in db before upload)
- */
-struct GNUNET_HashCode prevHash;
-
 /**
  * Hash of the recovery document to be uploaded
  */
 struct GNUNET_HashCode recoveryDataHash;
 
-/**
- * Hash of the previous uploaded recovery doucument
- * (normally the latest version stored in db before upload)
- */
-struct GNUNET_HashCode res_prev_hash;
-
 /**
  * Hash of the current recovery document
  */
@@ -263,7 +251,6 @@ run (void *cls)
           plugin->store_recovery_document (plugin->cls,
                                            &accountPubP,
                                            &accountSig,
-                                           &prevHash,
                                            &recoveryDataHash,
                                            &recovery_data,
                                            sizeof (&recovery_data),
@@ -287,7 +274,6 @@ run (void *cls)
           plugin->get_recovery_document (plugin->cls,
                                          &accountPubP,
                                          &res_account_sig,
-                                         &res_prev_hash,
                                          &res_recovery_data_hash,
                                          recversion,
                                          &recoverydatasize,
@@ -297,7 +283,6 @@ run (void *cls)
           plugin->get_latest_recovery_document (plugin->cls,
                                                 &accountPubP,
                                                 &res_account_sig,
-                                                &res_prev_hash,
                                                 &res_recovery_data_hash,
                                                 &recoverydatasize,
                                                 &res_recovery_data,

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