change use of gnunet-go to submodule

7 files changed, 30 insertions, 16 deletions

diff --git a/.gitmodules b/.gitmodules
index 3640bdb..f54e5f4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "contrib/gana"]
 	path = third_party/gana
 	url = https://git.gnunet.org/git/gana
+[submodule "third_party/gnunet-go"]
+	path = third_party/gnunet-go
+	url = https://git.gnunet.org/gnunet-go
diff --git a/cmd/taldir-cli/main.go b/cmd/taldir-cli/main.go
index 920d5eb..8d62544 100644
--- a/cmd/taldir-cli/main.go
+++ b/cmd/taldir-cli/main.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"os"
 
-	gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
+	gnunetutil "gnunet/util"
 	"taler.net/taldir/internal/util"
 	taldir "taler.net/taldir/pkg/rest"
 )
diff --git a/cmd/taldir-server/main_test.go b/cmd/taldir-server/main_test.go
index 2e5e86c..3000e31 100644
--- a/cmd/taldir-server/main_test.go
+++ b/cmd/taldir-server/main_test.go
@@ -28,7 +28,8 @@ import (
 	"strings"
 	"testing"
 
-	gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
+	gnunetutil "gnunet/util"
+
 	"github.com/jarcoal/httpmock"
 	_ "taler.net/taldir/cmd/taldir-server"
 	"taler.net/taldir/internal/util"
diff --git a/go.mod b/go.mod
index 8f184cb..4fec163 100644
--- a/go.mod
+++ b/go.mod
@@ -1,19 +1,32 @@
 module taler.net/taldir
 
-go 1.16
+go 1.18
 
 require (
-	git.gnunet.org/gnunet-go.git v0.1.28-0.20220717050634-369422be2512
-	github.com/bfix/gospel v1.2.15 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.0
 	github.com/jarcoal/httpmock v1.2.0
-	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/mattn/go-sqlite3 v1.14.14 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
+	gnunet v0.1.27
 	gopkg.in/ini.v1 v1.66.6
 	gorm.io/driver/postgres v1.3.4
 	gorm.io/gorm v1.23.4
 	taler.net/taler-go.git v0.0.0-20220719135513-36eb87bf37a3
 )
+
+require (
+	github.com/bfix/gospel v1.2.15 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.11.0 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.2.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/jackc/pgtype v1.10.0 // indirect
+	github.com/jackc/pgx/v4 v4.15.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 // indirect
+	golang.org/x/text v0.3.7 // indirect
+)
+
+replace gnunet v0.1.27 => ./third_party/gnunet-go/src/gnunet
diff --git a/internal/util/helper.go b/internal/util/helper.go
index b99d6af..239980f 100644
--- a/internal/util/helper.go
+++ b/internal/util/helper.go
@@ -21,7 +21,7 @@ package util
 import (
 	"crypto/sha512"
 	"fmt"
-	gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
+	gnunetutil "gnunet/util"
 	"math/rand"
 	talerutil "taler.net/taler-go.git/pkg/util"
 	"time"
diff --git a/pkg/rest/taldir.go b/pkg/rest/taldir.go
index 10d0477..5e50edf 100644
--- a/pkg/rest/taldir.go
+++ b/pkg/rest/taldir.go
@@ -36,7 +36,8 @@ import (
 	"strings"
 	"time"
 
-	gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
+	gnunetutil "gnunet/util"
+
 	"github.com/gorilla/mux"
 	"github.com/skip2/go-qrcode"
 	"gopkg.in/ini.v1"
@@ -492,11 +493,7 @@ func (t *Taldir) registerRequest(w http.ResponseWriter, r *http.Request) {
 		}
 		// In this case, this order was paid
 	}
-	if validationExists {
-		err = t.Db.Save(&validation).Error
-	} else {
-		err = t.Db.Create(&validation).Error
-	}
+	err = t.Db.Save(&validation).Error
 	if err != nil {
 		log.Println(err)
 		w.WriteHeader(500)
diff --git a/third_party/gnunet-go b/third_party/gnunet-go
new file mode 160000
+Subproject f425c2aeef06d1a6105678c8b058bdde65a26e7