commit 52d00c91bb5bcada014300ae62e0a440f95f8503
parent 66a23e1c0f3684703dbecadfa606146e0c6b535f
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Sun, 22 Mar 2026 15:57:03 +0100
remove now obsolete *Database function suffixes
Diffstat:
2 files changed, 55 insertions(+), 54 deletions(-)
diff --git a/pkg/taldir/db.go b/pkg/taldir/db.go
@@ -27,6 +27,7 @@ import (
"strings"
"time"
+ _ "github.com/lib/pq"
talerutil "github.com/schanzen/taler-go/pkg/util"
)
@@ -303,8 +304,8 @@ func OpenDatabase(psqlconn string) (*TaldirDatabase, error) {
}, nil
}
-// UpdateValidationInDatabase updates a validation in database
-func (db *TaldirDatabase) UpdateValidationInDatabase(v *Validation) error {
+// UpdateValidation updates a validation in database
+func (db *TaldirDatabase) UpdateValidation(v *Validation) error {
rows, err := db.updateValidationStmt.Query(v.HAlias, v.CreatedAt, v.Duration, v.TargetURI, v.Challenge, v.ChallengeSent, v.RequiresPayment, v.SolutionAttemptCount, v.LastSolutionTimeframeStart, v.OrderID, v.ValidatorName)
if err != nil {
return err
@@ -313,8 +314,8 @@ func (db *TaldirDatabase) UpdateValidationInDatabase(v *Validation) error {
return nil
}
-// InsertValidationIntoDatabase inserts a new validation into database
-func (db *TaldirDatabase) InsertValidationIntoDatabase(v *Validation) error {
+// InsertValidation inserts a new validation into database
+func (db *TaldirDatabase) InsertValidation(v *Validation) error {
rows, err := db.insertValidationStmt.Query(v.CreatedAt, v.HAlias, v.Duration, v.TargetURI, v.Challenge, v.ChallengeSent, v.RequiresPayment, v.SolutionAttemptCount, v.LastSolutionTimeframeStart, v.OrderID, v.ValidatorName)
if err != nil {
return err
@@ -323,8 +324,8 @@ func (db *TaldirDatabase) InsertValidationIntoDatabase(v *Validation) error {
return nil
}
-// GetValidationFromDatabase gets a Validation from database
-func (db *TaldirDatabase) GetValidationFromDatabase(v *Validation, hAlias string, targetURI string, duration time.Duration) error {
+// GetValidation gets a Validation from database
+func (db *TaldirDatabase) GetValidation(v *Validation, hAlias string, targetURI string, duration time.Duration) error {
// Execute Query
rows, err := db.getValidationStmt.Query(hAlias, targetURI, duration.Microseconds())
if err != nil {
@@ -351,8 +352,8 @@ func (db *TaldirDatabase) GetValidationFromDatabase(v *Validation, hAlias string
)
}
-// GetAllValidationsByHAliasFromDatabase gets all Validations by hash-salted alias from database
-func (db *TaldirDatabase) GetAllValidationsByHAliasFromDatabase(hAlias string) ([]Validation, error) {
+// GetAllValidationsByHAlias gets all Validations by hash-salted alias from database
+func (db *TaldirDatabase) GetAllValidationsByHAlias(hAlias string) ([]Validation, error) {
// Execute Query
rows, err := db.getAllValidationsByHAliasStmt.Query(hAlias)
if err != nil {
@@ -384,8 +385,8 @@ func (db *TaldirDatabase) GetAllValidationsByHAliasFromDatabase(hAlias string) (
return validations, nil
}
-// GetFirstValidationByHAliasFromDatabase gets the first Hash-salted alias from database
-func (db *TaldirDatabase) GetFirstValidationByHAliasFromDatabase(v *Validation, hAlias string) error {
+// GetFirstValidationByHAlias gets the first Hash-salted alias from database
+func (db *TaldirDatabase) GetFirstValidationByHAlias(v *Validation, hAlias string) error {
// Execute Query
rows, err := db.getFirstValidationByHAliasStmt.Query(hAlias)
if err != nil {
@@ -411,8 +412,8 @@ func (db *TaldirDatabase) GetFirstValidationByHAliasFromDatabase(v *Validation,
)
}
-// GetAllEntriesFromDatabase gets all Hash-salted aliases from database
-func (db *TaldirDatabase) GetAllEntriesFromDatabase() ([]Entry, error) {
+// GetAllEntries gets all Hash-salted aliases from database
+func (db *TaldirDatabase) GetAllEntries() ([]Entry, error) {
query := `SELECT
"hs_alias",
"created_at",
@@ -445,8 +446,8 @@ func (db *TaldirDatabase) GetAllEntriesFromDatabase() ([]Entry, error) {
return entries, nil
}
-// GetEntryByHsAliasFromDatabase gets the Hash-salted alias from database
-func (db *TaldirDatabase) GetEntryByHsAliasFromDatabase(e *Entry, hsAlias string) error {
+// GetEntryByHsAlias gets the Hash-salted alias from database
+func (db *TaldirDatabase) GetEntryByHsAlias(e *Entry, hsAlias string) error {
// Execute Query
rows, err := db.getEntryByHAliasStmt.Query(hsAlias)
if err != nil {
@@ -465,8 +466,8 @@ func (db *TaldirDatabase) GetEntryByHsAliasFromDatabase(e *Entry, hsAlias string
)
}
-// DeleteStaleValidationsFromDatabase purges stale validations
-func (db *TaldirDatabase) DeleteStaleValidationsFromDatabase(validationExpiration time.Duration) (int64, error) {
+// DeleteStaleValidations purges stale validations
+func (db *TaldirDatabase) DeleteStaleValidations(validationExpiration time.Duration) (int64, error) {
var ctx context.Context
ctx, stop := context.WithCancel(context.Background())
defer stop()
@@ -489,16 +490,16 @@ func (db *TaldirDatabase) DeleteStaleValidationsFromDatabase(validationExpiratio
}
func (db *TaldirDatabase) ClearDatabase() error {
- _, err := db.DeleteAllEntriesFromDatabase()
+ _, err := db.DeleteAllEntries()
if err != nil {
return err
}
- _, err = db.DeleteAllValidationsFromDatabase()
+ _, err = db.DeleteAllValidations()
return err
}
-// DeleteValidationsByHAliasFromDatabase purges Validations
-func (db *TaldirDatabase) DeleteValidationsByHAliasFromDatabase(hAlias string) (int64, error) {
+// DeleteValidationsByHAlias purges Validations
+func (db *TaldirDatabase) DeleteValidationsByHAlias(hAlias string) (int64, error) {
var ctx context.Context
ctx, stop := context.WithCancel(context.Background())
defer stop()
@@ -519,8 +520,8 @@ func (db *TaldirDatabase) DeleteValidationsByHAliasFromDatabase(hAlias string) (
return rows, nil
}
-// DeleteAllValidationsFromDatabase purges all Validations
-func (db *TaldirDatabase) DeleteAllValidationsFromDatabase() (int64, error) {
+// DeleteAllValidations purges all Validations
+func (db *TaldirDatabase) DeleteAllValidations() (int64, error) {
var ctx context.Context
ctx, stop := context.WithCancel(context.Background())
defer stop()
@@ -546,13 +547,13 @@ func (db *TaldirDatabase) DeleteAllValidationsFromDatabase() (int64, error) {
return rows, nil
}
-// DeleteValidationFromDatabase purges a Validation
-func (db *TaldirDatabase) DeleteValidationFromDatabase(v *Validation) (int64, error) {
- return db.DeleteValidationsByHAliasFromDatabase(v.HAlias)
+// DeleteValidation purges a Validation
+func (db *TaldirDatabase) DeleteValidation(v *Validation) (int64, error) {
+ return db.DeleteValidationsByHAlias(v.HAlias)
}
-// DeleteAllEntriesFromDatabase purges Entries
-func (db *TaldirDatabase) DeleteAllEntriesFromDatabase() (int64, error) {
+// DeleteAllEntries purges Entries
+func (db *TaldirDatabase) DeleteAllEntries() (int64, error) {
var ctx context.Context
ctx, stop := context.WithCancel(context.Background())
defer stop()
@@ -578,8 +579,8 @@ func (db *TaldirDatabase) DeleteAllEntriesFromDatabase() (int64, error) {
return rows, nil
}
-// DeleteEntryFromDatabase deletes an Entry
-func (db *TaldirDatabase) DeleteEntryFromDatabase(e *Entry) (int64, error) {
+// DeleteEntry deletes an Entry
+func (db *TaldirDatabase) DeleteEntry(e *Entry) (int64, error) {
var ctx context.Context
ctx, stop := context.WithCancel(context.Background())
defer stop()
@@ -602,8 +603,8 @@ func (db *TaldirDatabase) DeleteEntryFromDatabase(e *Entry) (int64, error) {
var ()
-// UpdateEntryInDatabase updates the Entry in database
-func (db *TaldirDatabase) UpdateEntryInDatabase(e *Entry) error {
+// UpdateEntry updates the Entry in database
+func (db *TaldirDatabase) UpdateEntry(e *Entry) error {
rows, err := db.updateEntryStmt.Query(e.HsAlias, e.CreatedAt, e.TargetURI, e.Duration)
if err != nil {
return err
@@ -612,8 +613,8 @@ func (db *TaldirDatabase) UpdateEntryInDatabase(e *Entry) error {
return nil
}
-// InsertEntryIntoDatabase inserts new Entry into database
-func (db *TaldirDatabase) InsertEntryIntoDatabase(e *Entry) error {
+// InsertEntry inserts new Entry into database
+func (db *TaldirDatabase) InsertEntry(e *Entry) error {
var err error
e.CreatedAt = time.Now().UnixMicro()
rows, err := db.insertEntryStmt.Query(e.HsAlias, e.CreatedAt, e.TargetURI, e.Duration)
diff --git a/pkg/taldir/taldir.go b/pkg/taldir/taldir.go
@@ -254,7 +254,7 @@ func (t *Taldir) getSingleEntry(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
var entry Entry
hsAlias := saltHAlias(vars["h_alias"], t.Salt)
- var err = t.DB.GetEntryByHsAliasFromDatabase(&entry, hsAlias)
+ var err = t.DB.GetEntryByHsAlias(&entry, hsAlias)
if err == nil {
w.Header().Set("Content-Type", "application/json")
resp, _ := json.Marshal(entry)
@@ -287,7 +287,7 @@ func (t *Taldir) disseminateStart(e Entry) {
// Disseminate all entries
func (t *Taldir) disseminateEntries() error {
- entries, err := t.DB.GetAllEntriesFromDatabase()
+ entries, err := t.DB.GetAllEntries()
if nil != err {
return err
}
@@ -339,7 +339,7 @@ func (t *Taldir) validationRequest(w http.ResponseWriter, r *http.Request) {
w.Write(resp)
return
}
- err = t.DB.GetFirstValidationByHAliasFromDatabase(&validation, vars["h_alias"])
+ err = t.DB.GetFirstValidationByHAlias(&validation, vars["h_alias"])
t.Logger.Logf(LogDebug, "Got validation %v", validation)
if err != nil {
w.WriteHeader(http.StatusNotFound)
@@ -356,7 +356,7 @@ func (t *Taldir) validationRequest(w http.ResponseWriter, r *http.Request) {
validation.LastSolutionTimeframeStart = time.Now().UnixMicro()
validation.SolutionAttemptCount = 1
}
- t.DB.UpdateValidationInDatabase(&validation)
+ t.DB.UpdateValidation(&validation)
t.Logger.Logf(LogDebug, "Generating solution from %s and %s", validation.TargetURI, validation.Challenge)
expectedSolution := util.GenerateSolution(validation.TargetURI, validation.Challenge)
@@ -365,7 +365,7 @@ func (t *Taldir) validationRequest(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusForbidden)
return
}
- _, err = t.DB.DeleteValidationFromDatabase(&validation)
+ _, err = t.DB.DeleteValidation(&validation)
if err != nil {
t.Logger.Logf(LogError, "Error deleting validation: %v", err)
w.WriteHeader(http.StatusInternalServerError)
@@ -373,10 +373,10 @@ func (t *Taldir) validationRequest(w http.ResponseWriter, r *http.Request) {
}
entry.HsAlias = saltHAlias(validation.HAlias, t.Salt)
tmpDuration := (entry.Duration + validation.Duration) * 1000
- err = t.DB.GetEntryByHsAliasFromDatabase(&entry, entry.HsAlias)
+ err = t.DB.GetEntryByHsAlias(&entry, entry.HsAlias)
if err == nil {
if validation.TargetURI == "" {
- _, err = t.DB.DeleteEntryFromDatabase(&entry)
+ _, err = t.DB.DeleteEntry(&entry)
if err != nil {
t.Logger.Logf(LogError, "Error deleting entry: %v", err)
w.WriteHeader(http.StatusInternalServerError)
@@ -387,7 +387,7 @@ func (t *Taldir) validationRequest(w http.ResponseWriter, r *http.Request) {
} else {
entry.TargetURI = validation.TargetURI
entry.Duration = tmpDuration
- err = t.DB.UpdateEntryInDatabase(&entry)
+ err = t.DB.UpdateEntry(&entry)
t.Logger.Logf(LogDebug, "Updated entry in database to: %v", entry)
if err != nil {
t.Logger.Logf(LogError, "Error updating entry: %v", err)
@@ -402,7 +402,7 @@ func (t *Taldir) validationRequest(w http.ResponseWriter, r *http.Request) {
t.Logger.Logf(LogWarning, "Validated a deletion request but no entry found for `%s'\n", entry.HsAlias)
} else {
entry.TargetURI = validation.TargetURI
- err = t.DB.InsertEntryIntoDatabase(&entry)
+ err = t.DB.InsertEntry(&entry)
if err != nil {
t.Logger.Logf(LogError, "Error inserting entry: %v", err)
w.WriteHeader(http.StatusInternalServerError)
@@ -415,7 +415,7 @@ func (t *Taldir) validationRequest(w http.ResponseWriter, r *http.Request) {
}
func (t *Taldir) isRateLimited(hAlias string) (bool, error) {
- validations, err := t.DB.GetAllValidationsByHAliasFromDatabase(hAlias)
+ validations, err := t.DB.GetAllValidationsByHAlias(hAlias)
// NOTE: Check rate limit
if err == nil {
// Limit re-initiation attempts to ValidationInitiationMax times
@@ -480,7 +480,7 @@ func (t *Taldir) registerRequest(w http.ResponseWriter, r *http.Request) {
validation.HAlias = hAlias
validation.ValidatorName = validator.Name()
hsAlias := saltHAlias(validation.HAlias, t.Salt)
- err = t.DB.GetEntryByHsAliasFromDatabase(&entry, hsAlias)
+ err = t.DB.GetEntryByHsAlias(&entry, hsAlias)
// Round to the nearest multiple of a month
reqDuration := time.Duration(req.Duration * 1000)
reqDuration = reqDuration.Round(monthDuration)
@@ -514,11 +514,11 @@ func (t *Taldir) registerRequest(w http.ResponseWriter, r *http.Request) {
}
jsonResp, _ := json.Marshal(rlResponse)
w.Write(jsonResp)
- t.DB.DeleteValidationFromDatabase(&validation)
+ t.DB.DeleteValidation(&validation)
return
}
t.Logger.Logf(LogDebug, "Looking for validation with %v %v %v\n", hAlias, req.TargetURI, reqDuration.Microseconds())
- err = t.DB.GetValidationFromDatabase(&validation, hAlias, req.TargetURI, reqDuration)
+ err = t.DB.GetValidation(&validation, hAlias, req.TargetURI, reqDuration)
validationExists := (nil == err)
t.Logger.Logf(LogDebug, "Validation exists %v\n", validationExists)
// FIXME: Always set new challenge?
@@ -529,7 +529,7 @@ func (t *Taldir) registerRequest(w http.ResponseWriter, r *http.Request) {
validation.Duration = reqDuration.Microseconds()
validation.CreatedAt = validation.LastSolutionTimeframeStart
t.Logger.Logf(LogDebug, "Storing new validation %v\n", validation)
- err = t.DB.InsertValidationIntoDatabase(&validation)
+ err = t.DB.InsertValidation(&validation)
if nil != err {
t.Logger.Logf(LogError, "Error inserting validation! %v", err)
w.WriteHeader(http.StatusInternalServerError)
@@ -570,7 +570,7 @@ func (t *Taldir) registerRequest(w http.ResponseWriter, r *http.Request) {
return
}
if len(payto) != 0 {
- err = t.DB.UpdateValidationInDatabase(&validation)
+ err = t.DB.UpdateValidation(&validation)
if nil != err {
t.Logger.Logf(LogError, "Error inserting validation! %v", err)
w.WriteHeader(http.StatusInternalServerError)
@@ -582,7 +582,7 @@ func (t *Taldir) registerRequest(w http.ResponseWriter, r *http.Request) {
}
// In this case, this order was paid
}
- err = t.DB.UpdateValidationInDatabase(&validation)
+ err = t.DB.UpdateValidation(&validation)
if err != nil {
t.Logger.Logf(LogError, "%s\n", err.Error())
w.WriteHeader(http.StatusInternalServerError)
@@ -594,7 +594,7 @@ func (t *Taldir) registerRequest(w http.ResponseWriter, r *http.Request) {
redirectionLink, err := validator.RegistrationStart(topic, link, message, req.Alias, validation.Challenge)
if err != nil {
t.Logger.Logf(LogError, "%s\n", err.Error())
- t.DB.DeleteValidationFromDatabase(&validation)
+ t.DB.DeleteValidation(&validation)
w.WriteHeader(http.StatusInternalServerError)
return
}
@@ -659,7 +659,7 @@ func (t *Taldir) validationPage(w http.ResponseWriter, r *http.Request) {
var png []byte
var validation Validation
- err := t.DB.GetFirstValidationByHAliasFromDatabase(&validation, vars["h_alias"])
+ err := t.DB.GetFirstValidationByHAlias(&validation, vars["h_alias"])
w.Header().Set("Content-Type", "text/html; charset=utf-8")
if err != nil {
// This validation does not exist.
@@ -834,7 +834,7 @@ func (t *Taldir) typeLookupResultPage(w http.ResponseWriter, r *http.Request) {
hAliasBin := HashAlias(val.Name(), r.URL.Query().Get("alias"))
hAlias := util.Base32CrockfordEncode(hAliasBin[:])
hsAlias := saltHAlias(hAlias, t.Salt)
- err := t.DB.GetEntryByHsAliasFromDatabase(&entry, hsAlias)
+ err := t.DB.GetEntryByHsAlias(&entry, hsAlias)
if err != nil {
t.Logger.Logf(LogError, "`%s` not found.\n", hAlias)
} else {
@@ -1041,7 +1041,7 @@ func (t *Taldir) Initialize(cfg TaldirConfig) {
t.DB = cfg.Db
if cfg.Ini.GetBool("directory", "purge_mappings_on_startup_dangerous", false) {
t.Logger.Logf(LogWarning, "DANGER Purging mappings!")
- num, err := t.DB.DeleteAllEntriesFromDatabase()
+ num, err := t.DB.DeleteAllEntries()
if err != nil {
t.Logger.Logf(LogDebug, "Error purging entries: `%v'.\n", err)
}
@@ -1055,7 +1055,7 @@ func (t *Taldir) Initialize(cfg TaldirConfig) {
}
go func() {
for {
- num, err := t.DB.DeleteStaleValidationsFromDatabase(validationExp)
+ num, err := t.DB.DeleteStaleValidations(validationExp)
if err != nil {
t.Logger.Logf(LogDebug, "Error purging stale validations: `%v'.\n", err)
}
