commit 5869a1a4187b49a19c24be900741f43d5059ff2a parent 194002465a2502bdf2ec815289d00b97757f9973 Author: Martin Schanzenbach <schanzen@gnunet.org> Date: Tue, 19 Jul 2022 10:59:43 +0200 follow go project bcp Diffstat:
32 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/.gitmodules b/.gitmodules @@ -1,3 +1,3 @@ [submodule "contrib/gana"] - path = contrib/gana + path = third_party/gana url = https://git.gnunet.org/git/gana diff --git a/Makefile b/Makefile @@ -3,11 +3,11 @@ all: gana server cli SCRIPT_TARGET:=$(shell dirname $(shell go list -f '{{.Target}}' ./cmd/taldir-server)) gana: - mkdir -p pkg/gana + mkdir -p internal/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 pkg/gana/ + cd third_party/gana/gnu-taler-error-codes && make taler_error_codes.go + cp third_party/gana/gnu-taler-error-codes/taler_error_codes.go internal/gana/ server: go build ./cmd/taldir-server @@ -17,7 +17,7 @@ cli: install: server cli go install ./cmd/taldir-server && go install ./cmd/taldir-cli - chmod +x scripts/* - cp scripts/* $(SCRIPT_TARGET) + chmod +x scripts/validators/* + cp scripts/validators/* $(SCRIPT_TARGET) .PHONY: all gana diff --git a/cmd/taldir-cli/main.go b/cmd/taldir-cli/main.go @@ -22,10 +22,11 @@ import ( "crypto/sha512" "flag" "fmt" - gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util" "os" - "taler.net/taldir/pkg/rest" - "taler.net/taldir/pkg/util" + + gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util" + "taler.net/taldir/internal/util" + taldir "taler.net/taldir/pkg/rest" ) // Generates a link from a challenge and address diff --git a/cmd/taldir-server/main_test.go b/cmd/taldir-server/main_test.go @@ -21,17 +21,18 @@ package main_test import ( "bytes" "crypto/sha512" - gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util" - "github.com/jarcoal/httpmock" "io/ioutil" "net/http" "net/http/httptest" "os" "strings" - _ "taler.net/taldir/cmd/taldir-server" - "taler.net/taldir/pkg/rest" - "taler.net/taldir/pkg/util" "testing" + + gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util" + "github.com/jarcoal/httpmock" + _ "taler.net/taldir/cmd/taldir-server" + "taler.net/taldir/internal/util" + taldir "taler.net/taldir/pkg/rest" ) var t taldir.Taldir diff --git a/config/taldir-example.conf b/configs/taldir-example.conf diff --git a/contrib/gana b/contrib/gana @@ -1 +0,0 @@ -Subproject commit efb03a1d25bad8bd6c40b37c9295d9b3e50ee5e9 diff --git a/pkg/util/helper.go b/internal/util/helper.go diff --git a/pkg/rest/taldir.go b/pkg/rest/taldir.go @@ -28,14 +28,6 @@ import ( "encoding/base64" "encoding/json" "fmt" - gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util" - "github.com/gorilla/mux" - "github.com/skip2/go-qrcode" - "golang.org/x/text/language" - "gopkg.in/ini.v1" - "gorm.io/driver/postgres" - "gorm.io/gorm" - "gorm.io/gorm/logger" "html/template" "io/ioutil" "log" @@ -44,10 +36,19 @@ import ( "os" "os/exec" "strings" - "taler.net/taldir/pkg/gana" - "taler.net/taldir/pkg/taler" - "taler.net/taldir/pkg/util" "time" + + gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util" + "github.com/gorilla/mux" + "github.com/skip2/go-qrcode" + "golang.org/x/text/language" + "gopkg.in/ini.v1" + "gorm.io/driver/postgres" + "gorm.io/gorm" + "gorm.io/gorm/logger" + "taler.net/taldir/internal/gana" + "taler.net/taldir/internal/util" + "taler.net/taldir/pkg/taler" ) // Taldir is the primary object of the Taldir service diff --git a/contrib/Makefile b/scripts/Makefile diff --git a/contrib/pp/Makefile b/scripts/pp/Makefile diff --git a/contrib/pp/README b/scripts/pp/README diff --git a/contrib/pp/conf.py b/scripts/pp/conf.py diff --git a/contrib/pp/en/0.epub b/scripts/pp/en/0.epub Binary files differ. diff --git a/contrib/pp/en/0.html b/scripts/pp/en/0.html diff --git a/contrib/pp/en/0.pdf b/scripts/pp/en/0.pdf Binary files differ. diff --git a/contrib/pp/en/0.txt b/scripts/pp/en/0.txt diff --git a/contrib/pp/en/0.xml b/scripts/pp/en/0.xml diff --git a/contrib/pp/pp.rst b/scripts/pp/pp.rst diff --git a/contrib/tos/Makefile b/scripts/tos/Makefile diff --git a/contrib/tos/README b/scripts/tos/README diff --git a/contrib/tos/conf.py b/scripts/tos/conf.py diff --git a/contrib/tos/en/0.epub b/scripts/tos/en/0.epub Binary files differ. diff --git a/contrib/tos/en/0.html b/scripts/tos/en/0.html diff --git a/contrib/tos/en/0.pdf b/scripts/tos/en/0.pdf Binary files differ. diff --git a/contrib/tos/en/0.txt b/scripts/tos/en/0.txt diff --git a/contrib/tos/en/0.xml b/scripts/tos/en/0.xml diff --git a/contrib/tos/tos.rst b/scripts/tos/tos.rst diff --git a/contrib/update-pp.sh b/scripts/update-pp.sh diff --git a/contrib/update-tos.sh b/scripts/update-tos.sh diff --git a/scripts/taldir-validate-mail b/scripts/validators/taldir-validate-mail diff --git a/scripts/taldir-validate-twitter b/scripts/validators/taldir-validate-twitter diff --git a/third_party/gana b/third_party/gana @@ -0,0 +1 @@ +Subproject commit efb03a1d25bad8bd6c40b37c9295d9b3e50ee5e9