[taler-taldir] 03/04: new taldir ecs

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository taldir.

commit 4721d5a9c4f084f4b30cede3eb695aa398131cff
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Jul 6 18:07:15 2022 +0200

    new taldir ecs
---
 Makefile                  | 8 ++++++++
 cmd/taldir-server/main.go | 7 ++++---
 contrib/gana              | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3708d34..c8c85d5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,12 @@ all: server cli
 
 SCRIPT_TARGET:=$(shell dirname $(shell go list -f '{{.Target}}' 
./cmd/taldir-server))
 
+gana:
+       git submodule update --init --recursive
+       git submodule sync --recursive
+       cd contrib/gana/gnu-taler-error-codes && make taler_error_codes.go
+       cp contrib/gana/gnu-taler-error-codes/taler_error_codes.go gana/
+
 server:
        go build ./cmd/taldir-server
 
@@ -12,3 +18,5 @@ install: server cli
        go install ./cmd/taldir-server && go install ./cmd/taldir-cli
        chmod +x scripts/*
        cp scripts/* $(SCRIPT_TARGET)
+
+.PHONY: all gana
diff --git a/cmd/taldir-server/main.go b/cmd/taldir-server/main.go
index 6ce547a..95b0463 100644
--- a/cmd/taldir-server/main.go
+++ b/cmd/taldir-server/main.go
@@ -42,6 +42,7 @@ import (
   "gorm.io/gorm"
   "encoding/base64"
   "taler.net/taldir/util"
+  "taler.net/taldir/gana"
   "crypto/sha512"
   "gorm.io/driver/postgres"
   "gopkg.in/ini.v1"
@@ -310,7 +311,7 @@ func registerRequest(w http.ResponseWriter, r 
*http.Request){
   }
   err := json.NewDecoder(r.Body).Decode(&req)
   if err != nil {
-    errDetail.Code = 1006 //TALER_EC_JSON_INVALID
+    errDetail.Code = gana.GENERIC_JSON_INVALID
     errDetail.Hint = "Unable to parse JSON"
     resp, _ := json.Marshal(errDetail)
     w.WriteHeader(400)
@@ -318,7 +319,7 @@ func registerRequest(w http.ResponseWriter, r 
*http.Request){
     return
   }
   if !validators[vars["method"]] {
-    errDetail.Code = 3 //TALER_EC_NOT_IMPLEMENTED
+    errDetail.Code = gana.TALDIR_METHOD_NOT_SUPPORTED
     errDetail.Hint = "Unsupported method"
     errDetail.Detail = "Given method: " + vars["method"]
     resp, _ := json.Marshal(errDetail)
@@ -342,7 +343,7 @@ func registerRequest(w http.ResponseWriter, r 
*http.Request){
     if time.Now().UnixMicro() < earliestReRegistration {
       w.WriteHeader(429)
       rlResponse := RateLimitedResponse{
-        Code: 23, //FIXME TALER_EC_TALDIR_REGISTER_RATE_LIMITED
+        Code: gana.TALDIR_REGISTER_RATE_LIMITED
         RequestFrequency: reqFrequency,
         Hint: "Registration rate limit reached",
       }
diff --git a/contrib/gana b/contrib/gana
index 14a5259..bddac6f 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 14a525926a15b8353d6f485016170c3f459ce578
+Subproject commit bddac6f7879261d2ba6942bc95290906c40f589c

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