Merge pull request #422 from mysteriumnetwork/techdebt/move-from-satori

moved to gofrs/uuid instead of satori/uuid

Gopkg.toml

@@ -54,8 +54,8 @@
   version = "1.1.0"
 
 [[constraint]]
-  name = "github.com/satori/go.uuid"
-  version = "1.2.0"
+  name = "github.com/gofrs/uuid"
+  version = "3.1.1"
 
 [[constraint]]
   name = "github.com/stretchr/testify"

session/generator.go

@@ -17,9 +17,13 @@
 
 package session
 
-import "github.com/satori/go.uuid"
+import "github.com/gofrs/uuid"
 
-// GenerateUUID method returns ID based on random UUID
-func GenerateUUID() ID {
-	return ID(uuid.NewV4().String())
+// GenerateUUID method returns ID based on random UUID, or error if we fail to generate one
+func GenerateUUID() (ID, error) {
+	uid, err := uuid.NewV4()
+	if err != nil {
+		return ID(""), err
+	}
+	return ID(uid.String()), nil
 }

session/generator_test.go

@@ -24,6 +24,7 @@ import (
 )
 
 func TestSessionIdLength(t *testing.T) {
-	sid := GenerateUUID()
+	sid, err := GenerateUUID()
+	assert.Nil(t, err)
 	assert.Len(t, sid, 36)
 }

session/manager.go

@@ -31,7 +31,7 @@ var (
 )
 
 // IDGenerator defines method for session id generation
-type IDGenerator func() ID
+type IDGenerator func() (ID, error)
 
 // ConfigProvider provides session config for remote client
 type ConfigProvider func() (ServiceConfiguration, error)
@@ -102,7 +102,10 @@ func (manager *manager) Create(consumerID identity.Identity, proposalID int) (se
 }
 
 func (manager *manager) createSession(consumerID identity.Identity) (sessionInstance Session, err error) {
-	sessionInstance.ID = manager.generateID()
+	sessionInstance.ID, err = manager.generateID()
+	if err != nil {
+		return
+	}
 	sessionInstance.ConsumerID = consumerID
 	sessionInstance.Config, err = manager.provideConfig()
 	return

session/manager_test.go

@@ -45,8 +45,8 @@ func mockedConfigProvider() (ServiceConfiguration, error) {
 	return expectedSessionConfig, nil
 }
 
-func generateSessionID() ID {
-	return expectedID
+func generateSessionID() (ID, error) {
+	return expectedID, nil
 }
 
 func saveSession(sessionInstance Session) {