logic of execute_refresh_commit is now clean

1 files changed, 251 insertions, 203 deletions

diff --git a/src/mint/mint_db.c b/src/mint/mint_db.c
index 67cf4b352..0e908425d 100644
--- a/src/mint/mint_db.c
+++ b/src/mint/mint_db.c
@@ -818,209 +818,6 @@ TALER_MINT_DB_upsert_known_coin (PGconn *db_conn,
 }
 
 
-/**
- * Store the commitment to the given (encrypted) refresh link data
- * for the given refresh session.
- *
- * @param db_conn database connection to use
- * @param refresh_session_pub public key of the refresh session this
- *        commitment belongs with
- * @param i
- * @param j
- * @param commit_link link information to store
- * @return #GNUNET_SYSERR on internal error, #GNUNET_OK on success
- */
-int
-TALER_MINT_DB_insert_refresh_commit_link (PGconn *db_conn,
-                                          const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
-                                          int i, int j,
-                                          const struct RefreshCommitLink *commit_link)
-{
-  uint16_t cnc_index_nbo = htons (i);
-  uint16_t oldcoin_index_nbo = htons (j);
-  struct TALER_DB_QueryParam params[] = {
-    TALER_DB_QUERY_PARAM_PTR(refresh_session_pub),
-    TALER_DB_QUERY_PARAM_PTR(&commit_link->transfer_pub),
-    TALER_DB_QUERY_PARAM_PTR(&cnc_index_nbo),
-    TALER_DB_QUERY_PARAM_PTR(&oldcoin_index_nbo),
-    TALER_DB_QUERY_PARAM_PTR(&commit_link->shared_secret_enc),
-    TALER_DB_QUERY_PARAM_END
-  };
-
-  PGresult *result = TALER_DB_exec_prepared (db_conn,
-                                             "insert_refresh_commit_link",
-                                             params);
-  if (PGRES_COMMAND_OK != PQresultStatus (result))
-  {
-    break_db_err (result);
-    PQclear (result);
-    return GNUNET_SYSERR;
-  }
-
-  if (0 != strcmp ("1", PQcmdTuples (result)))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  PQclear (result);
-  return GNUNET_OK;
-}
-
-
-int
-TALER_MINT_DB_get_refresh_commit_link (PGconn *db_conn,
-                                       const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
-                                       int cnc_index,
-                                       int oldcoin_index,
-                                       struct RefreshCommitLink *cc)
-{
-  uint16_t cnc_index_nbo = htons (cnc_index);
-  uint16_t oldcoin_index_nbo = htons (oldcoin_index);
-
-  struct TALER_DB_QueryParam params[] = {
-    TALER_DB_QUERY_PARAM_PTR(refresh_session_pub),
-    TALER_DB_QUERY_PARAM_PTR(&cnc_index_nbo),
-    TALER_DB_QUERY_PARAM_PTR(&oldcoin_index_nbo),
-    TALER_DB_QUERY_PARAM_END
-  };
-
-  PGresult *result = TALER_DB_exec_prepared (db_conn,
-                                             "get_refresh_commit_link",
-                                             params);
-  if (PGRES_TUPLES_OK != PQresultStatus (result))
-  {
-    break_db_err (result);
-    PQclear (result);
-    return GNUNET_SYSERR;
-  }
-
-  if (0 == PQntuples (result))
-  {
-    PQclear (result);
-    return GNUNET_NO;
-  }
-
-  struct TALER_DB_ResultSpec rs[] = {
-    TALER_DB_RESULT_SPEC("transfer_pub", &cc->transfer_pub),
-    TALER_DB_RESULT_SPEC("link_secret_enc", &cc->shared_secret_enc),
-    TALER_DB_RESULT_SPEC_END
-  };
-
-  if (GNUNET_YES != TALER_DB_extract_result (result, rs, 0))
-  {
-    PQclear (result);
-    GNUNET_free (cc);
-    return GNUNET_SYSERR;
-  }
-
-  PQclear (result);
-  return GNUNET_OK;
-}
-
-
-int
-TALER_MINT_DB_insert_refresh_commit_coin (PGconn *db_conn,
-                                          const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
-                                          int i, int j,
-                                          const struct RefreshCommitCoin *commit_coin)
-{
-  uint16_t cnc_index_nbo = htons (i);
-  uint16_t newcoin_index_nbo = htons (j);
-  struct TALER_DB_QueryParam params[] = {
-    TALER_DB_QUERY_PARAM_PTR(refresh_session_pub),
-    TALER_DB_QUERY_PARAM_PTR_SIZED(commit_coin->coin_ev, commit_coin->coin_ev_size),
-    TALER_DB_QUERY_PARAM_PTR(&cnc_index_nbo),
-    TALER_DB_QUERY_PARAM_PTR(&newcoin_index_nbo),
-    TALER_DB_QUERY_PARAM_PTR_SIZED(commit_coin->refresh_link->coin_priv_enc,
-                                   commit_coin->refresh_link->blinding_key_enc_size +
-                                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)),
-    TALER_DB_QUERY_PARAM_END
-  };
-
-  PGresult *result = TALER_DB_exec_prepared (db_conn, "insert_refresh_commit_coin", params);
-
-  if (PGRES_COMMAND_OK != PQresultStatus (result))
-  {
-    break_db_err (result);
-    PQclear (result);
-    return GNUNET_SYSERR;
-  }
-
-  if (0 != strcmp ("1", PQcmdTuples (result)))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  PQclear (result);
-  return GNUNET_OK;
-}
-
-
-int
-TALER_MINT_DB_get_refresh_commit_coin (PGconn *db_conn,
-                                       const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
-                                       int cnc_index,
-                                       int newcoin_index,
-                                       struct RefreshCommitCoin *cc)
-{
-  uint16_t cnc_index_nbo = htons (cnc_index);
-  uint16_t newcoin_index_nbo = htons (newcoin_index);
-  struct TALER_DB_QueryParam params[] = {
-    TALER_DB_QUERY_PARAM_PTR(refresh_session_pub),
-    TALER_DB_QUERY_PARAM_PTR(&cnc_index_nbo),
-    TALER_DB_QUERY_PARAM_PTR(&newcoin_index_nbo),
-    TALER_DB_QUERY_PARAM_END
-  };
-  char *c_buf;
-  size_t c_buf_size;
-  char *rl_buf;
-  size_t rl_buf_size;
-  struct TALER_RefreshLinkEncrypted *rl;
-
-  PGresult *result = TALER_DB_exec_prepared (db_conn, "get_refresh_commit_coin", params);
-
-  if (PGRES_TUPLES_OK != PQresultStatus (result))
-  {
-    break_db_err (result);
-    PQclear (result);
-    return GNUNET_SYSERR;
-  }
-
-  if (0 == PQntuples (result))
-  {
-    PQclear (result);
-    return GNUNET_NO;
-  }
-
-  struct TALER_DB_ResultSpec rs[] = {
-    TALER_DB_RESULT_SPEC_VAR("coin_ev", &c_buf, &c_buf_size),
-    TALER_DB_RESULT_SPEC_VAR("link_vector_enc", &rl_buf, &rl_buf_size),
-    TALER_DB_RESULT_SPEC_END
-  };
-  if (GNUNET_YES != TALER_DB_extract_result (result, rs, 0))
-  {
-    PQclear (result);
-    return GNUNET_SYSERR;
-  }
-  PQclear (result);
-  if (rl_buf_size < sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))
-  {
-    GNUNET_free (c_buf);
-    GNUNET_free (rl_buf);
-    return GNUNET_SYSERR;
-  }
-  rl = TALER_refresh_link_encrypted_decode (rl_buf,
-                                            rl_buf_size);
-  GNUNET_free (rl_buf);
-  cc->refresh_link = rl;
-  cc->coin_ev = c_buf;
-  cc->coin_ev_size = c_buf_size;
-  return GNUNET_YES;
-}
-
-
 struct GNUNET_CRYPTO_rsa_PublicKey *
 TALER_MINT_DB_get_refresh_order (PGconn *db_conn,
                                  uint16_t newcoin_index,
@@ -2029,6 +1826,257 @@ TALER_MINT_DB_get_refresh_melt (PGconn *db_conn,
 
 
 /**
+ * Store information about the commitment of the
+ * given coin for the given refresh session in the database.
+ *
+ * @param db_conn database connection to use
+ * @param refresh_session_pub refresh session this commitment belongs to
+ * @param i set index (1st dimension)
+ * @param j coin index (2nd dimension), corresponds to refreshed (new) coins
+ * @param commit_coin coin commitment to store
+ * @return #GNUNET_OK on success
+ *         #GNUNET_SYSERR on error
+ */
+int
+TALER_MINT_DB_insert_refresh_commit_coin (PGconn *db_conn,
+                                          const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
+                                          unsigned int i,
+                                          unsigned int j,
+                                          const struct RefreshCommitCoin *commit_coin)
+{
+  // FIXME: check logic!
+  uint16_t cnc_index_nbo = htons (i);
+  uint16_t newcoin_index_nbo = htons (j);
+  struct TALER_DB_QueryParam params[] = {
+    TALER_DB_QUERY_PARAM_PTR(refresh_session_pub),
+    TALER_DB_QUERY_PARAM_PTR_SIZED(commit_coin->coin_ev, commit_coin->coin_ev_size),
+    TALER_DB_QUERY_PARAM_PTR(&cnc_index_nbo),
+    TALER_DB_QUERY_PARAM_PTR(&newcoin_index_nbo),
+    TALER_DB_QUERY_PARAM_PTR_SIZED(commit_coin->refresh_link->coin_priv_enc,
+                                   commit_coin->refresh_link->blinding_key_enc_size +
+                                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)),
+    TALER_DB_QUERY_PARAM_END
+  };
+
+  PGresult *result = TALER_DB_exec_prepared (db_conn, "insert_refresh_commit_coin", params);
+
+  if (PGRES_COMMAND_OK != PQresultStatus (result))
+  {
+    break_db_err (result);
+    PQclear (result);
+    return GNUNET_SYSERR;
+  }
+
+  if (0 != strcmp ("1", PQcmdTuples (result)))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+
+  PQclear (result);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Obtain information about the commitment of the
+ * given coin of the given refresh session from the database.
+ *
+ * @param db_conn database connection to use
+ * @param refresh_session_pub refresh session the commitment belongs to
+ * @param i set index (1st dimension)
+ * @param j coin index (2nd dimension), corresponds to refreshed (new) coins
+ * @param commit_coin[OUT] coin commitment to return
+ * @return #GNUNET_OK on success
+ *         #GNUNET_NO if not found
+ *         #GNUNET_SYSERR on error
+ */
+int
+TALER_MINT_DB_get_refresh_commit_coin (PGconn *db_conn,
+                                       const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
+                                       unsigned int cnc_index,
+                                       unsigned int newcoin_index,
+                                       struct RefreshCommitCoin *cc)
+{
+  // FIXME: check logic!
+  uint16_t cnc_index_nbo = htons (cnc_index);
+  uint16_t newcoin_index_nbo = htons (newcoin_index);
+  struct TALER_DB_QueryParam params[] = {
+    TALER_DB_QUERY_PARAM_PTR(refresh_session_pub),
+    TALER_DB_QUERY_PARAM_PTR(&cnc_index_nbo),
+    TALER_DB_QUERY_PARAM_PTR(&newcoin_index_nbo),
+    TALER_DB_QUERY_PARAM_END
+  };
+  char *c_buf;
+  size_t c_buf_size;
+  char *rl_buf;
+  size_t rl_buf_size;
+  struct TALER_RefreshLinkEncrypted *rl;
+
+  PGresult *result = TALER_DB_exec_prepared (db_conn, "get_refresh_commit_coin", params);
+
+  if (PGRES_TUPLES_OK != PQresultStatus (result))
+  {
+    break_db_err (result);
+    PQclear (result);
+    return GNUNET_SYSERR;
+  }
+
+  if (0 == PQntuples (result))
+  {
+    PQclear (result);
+    return GNUNET_NO;
+  }
+
+  struct TALER_DB_ResultSpec rs[] = {
+    TALER_DB_RESULT_SPEC_VAR("coin_ev", &c_buf, &c_buf_size),
+    TALER_DB_RESULT_SPEC_VAR("link_vector_enc", &rl_buf, &rl_buf_size),
+    TALER_DB_RESULT_SPEC_END
+  };
+  if (GNUNET_YES != TALER_DB_extract_result (result, rs, 0))
+  {
+    PQclear (result);
+    return GNUNET_SYSERR;
+  }
+  PQclear (result);
+  if (rl_buf_size < sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))
+  {
+    GNUNET_free (c_buf);
+    GNUNET_free (rl_buf);
+    return GNUNET_SYSERR;
+  }
+  rl = TALER_refresh_link_encrypted_decode (rl_buf,
+                                            rl_buf_size);
+  GNUNET_free (rl_buf);
+  cc->refresh_link = rl;
+  cc->coin_ev = c_buf;
+  cc->coin_ev_size = c_buf_size;
+  return GNUNET_YES;
+}
+
+
+/**
+ * Store the commitment to the given (encrypted) refresh link data
+ * for the given refresh session.
+ *
+ * @param db_conn database connection to use
+ * @param refresh_session_pub public key of the refresh session this
+ *        commitment belongs with
+ * @param i set index (1st dimension)
+ * @param j coin index (2nd dimension), corresponds to melted (old) coins
+ * @param commit_link link information to store
+ * @return #GNUNET_SYSERR on internal error, #GNUNET_OK on success
+ */
+int
+TALER_MINT_DB_insert_refresh_commit_link (PGconn *db_conn,
+                                          const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
+                                          unsigned int i,
+                                          unsigned int j,
+                                          const struct RefreshCommitLink *commit_link)
+{
+  // FIXME: check logic!
+  uint16_t cnc_index_nbo = htons (i);
+  uint16_t oldcoin_index_nbo = htons (j);
+  struct TALER_DB_QueryParam params[] = {
+    TALER_DB_QUERY_PARAM_PTR(refresh_session_pub),
+    TALER_DB_QUERY_PARAM_PTR(&commit_link->transfer_pub),
+    TALER_DB_QUERY_PARAM_PTR(&cnc_index_nbo),
+    TALER_DB_QUERY_PARAM_PTR(&oldcoin_index_nbo),
+    TALER_DB_QUERY_PARAM_PTR(&commit_link->shared_secret_enc),
+    TALER_DB_QUERY_PARAM_END
+  };
+
+  PGresult *result = TALER_DB_exec_prepared (db_conn,
+                                             "insert_refresh_commit_link",
+                                             params);
+  if (PGRES_COMMAND_OK != PQresultStatus (result))
+  {
+    break_db_err (result);
+    PQclear (result);
+    return GNUNET_SYSERR;
+  }
+
+  if (0 != strcmp ("1", PQcmdTuples (result)))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+
+  PQclear (result);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Obtain the commited (encrypted) refresh link data
+ * for the given refresh session.
+ *
+ * @param db_conn database connection to use
+ * @param refresh_session_pub public key of the refresh session this
+ *        commitment belongs with
+ * @param i set index (1st dimension)
+ * @param j coin index (2nd dimension), corresponds to melted (old) coins
+ * @param cc[OUT] link information to return
+ * @return #GNUNET_SYSERR on internal error,
+ *         #GNUNET_NO if commitment was not found
+ *         #GNUNET_OK on success
+ */
+int
+TALER_MINT_DB_get_refresh_commit_link (PGconn *db_conn,
+                                       const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
+                                       unsigned int cnc_index,
+                                       unsigned int oldcoin_index,
+                                       struct RefreshCommitLink *cc)
+{
+  // FIXME: check logic!
+  uint16_t cnc_index_nbo = htons (cnc_index);
+  uint16_t oldcoin_index_nbo = htons (oldcoin_index);
+
+  struct TALER_DB_QueryParam params[] = {
+    TALER_DB_QUERY_PARAM_PTR(refresh_session_pub),
+    TALER_DB_QUERY_PARAM_PTR(&cnc_index_nbo),
+    TALER_DB_QUERY_PARAM_PTR(&oldcoin_index_nbo),
+    TALER_DB_QUERY_PARAM_END
+  };
+
+  PGresult *result = TALER_DB_exec_prepared (db_conn,
+                                             "get_refresh_commit_link",
+                                             params);
+  if (PGRES_TUPLES_OK != PQresultStatus (result))
+  {
+    break_db_err (result);
+    PQclear (result);
+    return GNUNET_SYSERR;
+  }
+
+  if (0 == PQntuples (result))
+  {
+    PQclear (result);
+    return GNUNET_NO;
+  }
+
+  struct TALER_DB_ResultSpec rs[] = {
+    TALER_DB_RESULT_SPEC("transfer_pub", &cc->transfer_pub),
+    TALER_DB_RESULT_SPEC("link_secret_enc", &cc->shared_secret_enc),
+    TALER_DB_RESULT_SPEC_END
+  };
+
+  if (GNUNET_YES != TALER_DB_extract_result (result, rs, 0))
+  {
+    PQclear (result);
+    GNUNET_free (cc);
+    return GNUNET_SYSERR;
+  }
+
+  PQclear (result);
+  return GNUNET_OK;
+}
+
+
+
+
+
+/**
  * Compile a list of all (historic) transactions performed
  * with the given coin (/refresh/melt and /deposit operations).
  *