From ccfd8c293eb149bb0927f919d44d68390c04d64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20Doma=C5=A1evi=C4=8Dius?= Date: Wed, 14 Sep 2022 17:58:56 +0300 Subject: [PATCH] NodeUI 2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mantas Domaševičius --- go.mod | 4 ++-- go.sum | 2 ++ ui/server.go | 2 +- ui/versionmanager/version_manager.go | 2 +- ui/versionmanager/version_manager_test.go | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 050bddfea..4a8544f4e 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,6 @@ require ( github.com/go-openapi/strfmt v0.19.3 github.com/go-ozzo/ozzo-validation v3.6.0+incompatible github.com/gofrs/uuid v3.3.0+incompatible - github.com/golang/protobuf v1.5.2 github.com/google/go-github/v28 v28.1.1 github.com/google/go-github/v35 v35.2.0 github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204 @@ -38,7 +37,7 @@ require ( github.com/mysteriumnetwork/EventBus v0.0.0-20220415063055-d22cb121672c github.com/mysteriumnetwork/feedback v1.1.2-0.20211228095831-9dfca34c9ab7 github.com/mysteriumnetwork/go-ci v0.0.0-20220711082519-1245471bae0d - github.com/mysteriumnetwork/go-dvpn-web v1.17.2 + github.com/mysteriumnetwork/go-dvpn-web/v2 v2.0.2 github.com/mysteriumnetwork/go-openvpn v0.0.23 github.com/mysteriumnetwork/go-rest v0.3.1 github.com/mysteriumnetwork/go-wondershaper v1.0.1 @@ -110,6 +109,7 @@ require ( github.com/go-playground/validator/v10 v10.4.1 // indirect github.com/go-stack/stack v1.8.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/go-cmp v0.5.6 // indirect diff --git a/go.sum b/go.sum index 31e8478aa..2f2933d9e 100644 --- a/go.sum +++ b/go.sum @@ -820,6 +820,8 @@ github.com/mysteriumnetwork/go-ci v0.0.0-20220711082519-1245471bae0d h1:IejX10D2 github.com/mysteriumnetwork/go-ci v0.0.0-20220711082519-1245471bae0d/go.mod h1:FdrIqN3Z27igwo8A4aKZcmds7q894iGcdUIPz0+vOXY= github.com/mysteriumnetwork/go-dvpn-web v1.17.2 h1:CMk3UB0FuJnbIqBEV66e7TRaGBucBekHR52i7LYexC8= github.com/mysteriumnetwork/go-dvpn-web v1.17.2/go.mod h1:EflugstrqapwAGF/Jgekw70mhyJbkFlQZGflQ+MILcc= +github.com/mysteriumnetwork/go-dvpn-web/v2 v2.0.2 h1:EE5vQ4c7q/ce0G7ilBtYEIqXTDeV57VayjbZFdTpGeI= +github.com/mysteriumnetwork/go-dvpn-web/v2 v2.0.2/go.mod h1:rFTH4Hfx0pdZUTrJtzy3Yaz0mHTaur7+TezbvWA/8C8= github.com/mysteriumnetwork/go-openvpn v0.0.23 h1:6BKoTwU9CpJL/Na9M9a0uaelAaVIo/XZPDpElfzFjxM= github.com/mysteriumnetwork/go-openvpn v0.0.23/go.mod h1:YDjnxC/3sGNecq/f6GM0BGz7nnGPTPIGtQjHaoLf8UE= github.com/mysteriumnetwork/go-rest v0.3.1 h1:zWyeW08ZVm9pWfjBrnq6SYZxoqc8kqzkr3eAbgZqr50= diff --git a/ui/server.go b/ui/server.go index 52db64d66..70a32ec3c 100644 --- a/ui/server.go +++ b/ui/server.go @@ -28,7 +28,7 @@ import ( "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" - godvpnweb "github.com/mysteriumnetwork/go-dvpn-web" + godvpnweb "github.com/mysteriumnetwork/go-dvpn-web/v2" "github.com/mysteriumnetwork/node/requests" "github.com/mysteriumnetwork/node/ui/discovery" "github.com/rs/zerolog/log" diff --git a/ui/versionmanager/version_manager.go b/ui/versionmanager/version_manager.go index 4a9ab497a..12fce159b 100644 --- a/ui/versionmanager/version_manager.go +++ b/ui/versionmanager/version_manager.go @@ -27,7 +27,7 @@ import ( "path/filepath" "time" - godvpnweb "github.com/mysteriumnetwork/go-dvpn-web" + godvpnweb "github.com/mysteriumnetwork/go-dvpn-web/v2" "github.com/mysteriumnetwork/node/requests" "github.com/pkg/errors" "github.com/rs/zerolog/log" diff --git a/ui/versionmanager/version_manager_test.go b/ui/versionmanager/version_manager_test.go index df0916eda..689e783db 100644 --- a/ui/versionmanager/version_manager_test.go +++ b/ui/versionmanager/version_manager_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - godvpnweb "github.com/mysteriumnetwork/go-dvpn-web" + godvpnweb "github.com/mysteriumnetwork/go-dvpn-web/v2" "github.com/stretchr/testify/assert" )