diff options
| author | Jeroen Wijenbergh <jeroen.wijenbergh@geant.org> | 2025-08-25 10:59:37 +0200 |
|---|---|---|
| committer | Jeroen Wijenbergh <jeroen.wijenbergh@geant.org> | 2025-08-25 13:06:41 +0200 |
| commit | 27b95b4911da055fe9b5fb37b5fb4a33eda6b989 (patch) | |
| tree | f6eb1143fa9bd2995d671b71d75c950e2c703660 /exports | |
| parent | b4f4f5600298436c63b89f289c318d777300c499 (diff) | |
All: Remove util packages
Was giving linting errors and it's not a good idea anyways
Diffstat (limited to 'exports')
| -rw-r--r-- | exports/exports.go | 5 | ||||
| -rw-r--r-- | exports/exports_test_wrapper.go | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/exports/exports.go b/exports/exports.go index 47b9f14..9be3b66 100644 --- a/exports/exports.go +++ b/exports/exports.go @@ -26,11 +26,10 @@ import ( "unsafe" "codeberg.org/eduVPN/eduvpn-common/client" - "codeberg.org/eduVPN/eduvpn-common/i18nerr" + "codeberg.org/eduVPN/eduvpn-common/i18n/err" "codeberg.org/eduVPN/eduvpn-common/types/cookie" errtypes "codeberg.org/eduVPN/eduvpn-common/types/error" srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" - "codeberg.org/eduVPN/eduvpn-common/util" ) // goString copies a null-terminated *C.char to a Go string. @@ -1053,7 +1052,7 @@ func SetTokenHandler(getter C.TokenGetter, setter C.TokenSetter) *C.char { // //export CalculateGateway func CalculateGateway(subnet *C.char) (*C.char, *C.char) { - gw, err := util.CalculateGateway(goString(subnet)) + gw, err := client.CalculateGateway(goString(subnet)) if err != nil { return nil, getCError(err) } diff --git a/exports/exports_test_wrapper.go b/exports/exports_test_wrapper.go index de6aa21..0c9b9dc 100644 --- a/exports/exports_test_wrapper.go +++ b/exports/exports_test_wrapper.go @@ -21,9 +21,9 @@ import ( "testing" "time" + "codeberg.org/eduVPN/eduvpn-common/i18n" "codeberg.org/eduVPN/eduvpn-common/internal/test" "codeberg.org/eduVPN/eduvpn-common/types/error" - "codeberg.org/eduVPN/eduvpn-common/util" httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" ) @@ -49,7 +49,7 @@ func getError(t *testing.T, gerr *C.char) string { t.Fatalf("failed getting error JSON, val: %v, err: %v", jsonErr, jerr) } - return util.GetLanguageMatched(transl.Message, "en") + return i18n.GetLanguageMatched(transl.Message, "en") } // ClonedAskTransition is a clone of the struct types/server.go RequiredAskTransition |