diff --git a/.travis.yml b/.travis.yml index 71d4b894..ab356dde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ env: global: - GO15VENDOREXPERIMENT=1 install: -- go get github.com/nats-io/nats +- go get github.com/nats-io/go-nats - go get github.com/mattn/goveralls - go get github.com/wadey/gocovmerge - go get honnef.co/go/staticcheck/cmd/staticcheck diff --git a/server/client_test.go b/server/client_test.go index 1260a9b7..43a144bf 100644 --- a/server/client_test.go +++ b/server/client_test.go @@ -17,7 +17,7 @@ import ( "crypto/tls" - "github.com/nats-io/nats" + "github.com/nats-io/go-nats" ) type serverInfo struct { @@ -658,7 +658,7 @@ func TestUnsubRace(t *testing.T) { func TestTLSCloseClientConnection(t *testing.T) { opts, err := ProcessConfigFile("./configs/tls.conf") if err != nil { - t.Fatalf("Error processign config file: %v", err) + t.Fatalf("Error processing config file: %v", err) } opts.Authorization = "" opts.TLSTimeout = 100 diff --git a/server/monitor_test.go b/server/monitor_test.go index 6a5a4725..1b4942b3 100644 --- a/server/monitor_test.go +++ b/server/monitor_test.go @@ -9,12 +9,12 @@ import ( "net/http" "net/url" "strings" + "sync" "testing" "time" "unicode" - "github.com/nats-io/nats" - "sync" + "github.com/nats-io/go-nats" ) const CLIENT_PORT = 11224 diff --git a/server/ping_test.go b/server/ping_test.go index fbf05a96..754ad4cd 100644 --- a/server/ping_test.go +++ b/server/ping_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/nats-io/nats" + "github.com/nats-io/go-nats" ) const PING_CLIENT_PORT = 11228 diff --git a/server/routes_test.go b/server/routes_test.go index b9600f03..251c21fa 100644 --- a/server/routes_test.go +++ b/server/routes_test.go @@ -7,11 +7,11 @@ import ( "net" "net/url" "reflect" + "strconv" "testing" "time" - "github.com/nats-io/nats" - "strconv" + "github.com/nats-io/go-nats" ) func TestRouteConfig(t *testing.T) { diff --git a/test/client_auth_test.go b/test/client_auth_test.go index 7c8890c7..ea519d8d 100644 --- a/test/client_auth_test.go +++ b/test/client_auth_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/nats-io/nats" + "github.com/nats-io/go-nats" ) func TestMultipleUserAuth(t *testing.T) { diff --git a/test/client_cluster_test.go b/test/client_cluster_test.go index 0f6ced71..c9416476 100644 --- a/test/client_cluster_test.go +++ b/test/client_cluster_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/nats-io/nats" + "github.com/nats-io/go-nats" ) func TestServerRestartReSliceIssue(t *testing.T) { diff --git a/test/maxpayload_test.go b/test/maxpayload_test.go index cf32a4d3..8e0b9434 100644 --- a/test/maxpayload_test.go +++ b/test/maxpayload_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/nats-io/nats" + "github.com/nats-io/go-nats" ) func TestMaxPayload(t *testing.T) { diff --git a/test/monitor_test.go b/test/monitor_test.go index 176b99c6..9575b274 100644 --- a/test/monitor_test.go +++ b/test/monitor_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/nats-io/gnatsd/server" - "github.com/nats-io/nats" + "github.com/nats-io/go-nats" ) const CLIENT_PORT = 11422 diff --git a/test/tls_test.go b/test/tls_test.go index dfe45e6c..aad5c109 100644 --- a/test/tls_test.go +++ b/test/tls_test.go @@ -15,7 +15,7 @@ import ( "time" "github.com/nats-io/gnatsd/server" - "github.com/nats-io/nats" + "github.com/nats-io/go-nats" ) func TestTLSConnection(t *testing.T) { diff --git a/vendor/github.com/nats-io/nuid/nuid.go b/vendor/github.com/nats-io/nuid/nuid.go index 15aaca61..1fda3770 100644 --- a/vendor/github.com/nats-io/nuid/nuid.go +++ b/vendor/github.com/nats-io/nuid/nuid.go @@ -19,6 +19,9 @@ import ( // that is started at a pseudo random number and increments with a pseudo-random increment. // Total is 22 bytes of base 62 ascii text :) +// Version of the library +const Version = "1.0.0" + const ( digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" base = 62 diff --git a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go index 27bc931c..f8b807f9 100644 --- a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go +++ b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go @@ -12,10 +12,9 @@ import ( "crypto/subtle" "errors" "fmt" + "golang.org/x/crypto/blowfish" "io" "strconv" - - "golang.org/x/crypto/blowfish" ) const ( diff --git a/vendor/golang.org/x/crypto/blowfish/cipher.go b/vendor/golang.org/x/crypto/blowfish/cipher.go index 542984aa..a73954f3 100644 --- a/vendor/golang.org/x/crypto/blowfish/cipher.go +++ b/vendor/golang.org/x/crypto/blowfish/cipher.go @@ -39,7 +39,7 @@ func NewCipher(key []byte) (*Cipher, error) { // NewSaltedCipher creates a returns a Cipher that folds a salt into its key // schedule. For most purposes, NewCipher, instead of NewSaltedCipher, is -// sufficient and desirable. For bcrypt compatiblity, the key can be over 56 +// sufficient and desirable. For bcrypt compatibility, the key can be over 56 // bytes. func NewSaltedCipher(key, salt []byte) (*Cipher, error) { if len(salt) == 0 { diff --git a/vendor/manifest b/vendor/manifest index 8ba02808..df9980d8 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -4,14 +4,16 @@ { "importpath": "github.com/nats-io/nuid", "repository": "https://github.com/nats-io/nuid", - "revision": "a5152d67cf63cbfb5d992a395458722a45194715", + "vcs": "git", + "revision": "289cccf02c178dc782430d534e3c1f5b72af807f", "branch": "master", "notests": true }, { "importpath": "golang.org/x/crypto/bcrypt", "repository": "https://go.googlesource.com/crypto", - "revision": "9e7f5dc375abeb9619ea3c5c58502c428f457aa2", + "vcs": "git", + "revision": "9477e0b78b9ac3d0b03822fd95422e2fe07627cd", "branch": "master", "path": "/bcrypt", "notests": true @@ -19,7 +21,8 @@ { "importpath": "golang.org/x/crypto/blowfish", "repository": "https://go.googlesource.com/crypto", - "revision": "9e7f5dc375abeb9619ea3c5c58502c428f457aa2", + "vcs": "git", + "revision": "9477e0b78b9ac3d0b03822fd95422e2fe07627cd", "branch": "master", "path": "/blowfish", "notests": true