Skip to content
This repository has been archived by the owner on Aug 14, 2019. It is now read-only.

Commit

Permalink
update uuid library, fix test file naming
Browse files Browse the repository at this point in the history
  • Loading branch information
schwartzmx committed Jun 28, 2019
1 parent 2e6f3cd commit 72d8ad8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 15 deletions.
4 changes: 1 addition & 3 deletions go.mod
@@ -1,9 +1,7 @@
module gremgo

require (
github.com/gofrs/uuid v3.2.0+incompatible
github.com/gorilla/websocket v1.2.0
github.com/kr/pretty v0.1.0 // indirect
github.com/pkg/errors v0.8.1
github.com/satori/go.uuid v1.2.0
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
)
11 changes: 2 additions & 9 deletions go.sum
@@ -1,13 +1,6 @@
github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gorilla/websocket v1.2.0 h1:VJtLvh6VQym50czpZzx07z/kw9EgAxI3x1ZB8taTMQQ=
github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
File renamed without changes.
6 changes: 3 additions & 3 deletions request.go
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/base64"
"encoding/json"

uuid "github.com/satori/go.uuid"
"github.com/gofrs/uuid"
)

type requester interface {
Expand All @@ -24,7 +24,7 @@ type request struct {
// prepareRequest packages a query and binding into the format that Gremlin Server accepts
func prepareRequest(query string) (req request, id string, err error) {
var uuID uuid.UUID
uuID = uuid.NewV4()
uuID, _ = uuid.NewV4()
id = uuID.String()

req.RequestID = id
Expand All @@ -41,7 +41,7 @@ func prepareRequest(query string) (req request, id string, err error) {
// prepareRequest packages a query and binding into the format that Gremlin Server accepts
func prepareRequestWithBindings(query string, bindings, rebindings map[string]string) (req request, id string, err error) {
var uuID uuid.UUID
uuID = uuid.NewV4()
uuID, _ = uuid.NewV4()
id = uuID.String()

req.RequestID = id
Expand Down

0 comments on commit 72d8ad8

Please sign in to comment.