Skip to content

Commit

Permalink
Change import paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@DavidHuie
DavidHuie committed Apr 15, 2019
1 parent b89d8fe commit 3d377b6
Show file tree
Hide file tree
Showing 37 changed files with 85 additions and 82 deletions.
2 changes: 1 addition & 1 deletion ably/ably_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"testing"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"
)

func nonil(err ...error) error {
Expand Down
4 changes: 2 additions & 2 deletions ably/ablytest/ablytest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strconv"
"time"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"
)

var Timeout = 30 * time.Second
Expand Down
2 changes: 1 addition & 1 deletion ably/ablytest/proxies.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/url"
"strconv"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"
)

var hopHeaders = map[string]struct{}{
Expand Down
6 changes: 3 additions & 3 deletions ably/ablytest/recorders.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"sync/atomic"
"time"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably/proto"
)

// RoundTripRecorder is a http.Transport wrapper which records
Expand Down
2 changes: 1 addition & 1 deletion ably/ablytest/resultgroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"time"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"
)

func Wait(res ably.Result, err error) error {
Expand Down
2 changes: 1 addition & 1 deletion ably/ablytest/sandbox.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"path"
"time"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"
)

type Key struct {
Expand Down
6 changes: 3 additions & 3 deletions ably/auth_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"testing"
"time"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/ablytest"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably/proto"
)

func single() *ably.PaginateParams {
Expand Down
2 changes: 1 addition & 1 deletion ably/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net"
"net/http"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"
)

func toStatusCode(code int) int {
Expand Down
2 changes: 1 addition & 1 deletion ably/error_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ably_test
import (
"testing"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"
)

func TestCheckValidHTTPResponse(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ably/http_paginated_response.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"reflect"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"
)

// HTTPPaginatedResponse represent a response from an http request.
Expand Down
6 changes: 3 additions & 3 deletions ably/http_paginated_response_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"sort"
"testing"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"

"github.com/ably/ably-go/ably/ablytest"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably/proto"
)

func TestHTTPPaginatedResponse(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ably/internal/ablyutil/websocket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"net/url"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"

"golang.org/x/net/websocket"
)
Expand Down
2 changes: 1 addition & 1 deletion ably/logger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ably_test
import (
"testing"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"
)

type dummyLogger struct {
Expand Down
28 changes: 14 additions & 14 deletions ably/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"time"

"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably/proto"
)

const (
Expand All @@ -23,14 +23,14 @@ const (
)

var defaultOptions = &ClientOptions{
RestHost: RestHost,
FallbackHosts: DefaultFallbackHosts(),
HTTPMaxRetryCount: 3,
RealtimeHost: "realtime.ably.io",
TimeoutConnect: 15 * time.Second,
TimeoutDisconnect: 30 * time.Second,
TimeoutSuspended: 2 * time.Minute,
FallbackRetryTimeout: 10 * time.Minute,
RestHost: RestHost,
FallbackHosts: DefaultFallbackHosts(),
HTTPMaxRetryCount: 3,
RealtimeHost: "realtime.ably.io",
TimeoutConnect: 15 * time.Second,
TimeoutDisconnect: 30 * time.Second,
TimeoutSuspended: 2 * time.Minute,
FallbackRetryTimeout: 10 * time.Minute,
IdempotentRestPublishing: false,
}

Expand Down Expand Up @@ -197,10 +197,10 @@ type ClientOptions struct {

// When true idempotent rest publishing will be enabled.
// Spec TO3n
IdempotentRestPublishing bool
TimeoutConnect time.Duration // time period after which connect request is failed
TimeoutDisconnect time.Duration // time period after which disconnect request is failed
TimeoutSuspended time.Duration // time period after which no more reconnection attempts are performed
IdempotentRestPublishing bool
TimeoutConnect time.Duration // time period after which connect request is failed
TimeoutDisconnect time.Duration // time period after which disconnect request is failed
TimeoutSuspended time.Duration // time period after which no more reconnection attempts are performed

// Dial specifies the dial function for creating message connections used
// by RealtimeClient.
Expand Down
2 changes: 1 addition & 1 deletion ably/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/url"
"testing"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"
)

func TestClientOptions(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ably/paginated_result.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"strings"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"
)

// relLinkRegexp is the regexp that matches our pagination format
Expand Down
2 changes: 1 addition & 1 deletion ably/paginated_result_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ably_test
import (
"testing"

"github.com/ably/ably-go/ably"
"github.com/DavidHuie/ably-go/ably"
)

func TestPaginatedResult(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ably/proto/crypto_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package proto_test
import (
"testing"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"
)

func TestGenerateRandomKey(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ably/proto/error_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"
)

func TestErrorInfo(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions ably/proto/message_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"reflect"
"testing"

"github.com/ably/ably-go/ably/ablytest"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably/proto"
)

type custom struct{}
Expand Down
4 changes: 2 additions & 2 deletions ably/proto/presence_message_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"testing"

"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably/proto"
)

func TestPresenceMessage(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ably/realtime_channel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"
"sync"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions ably/realtime_channel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"testing"
"time"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/ablytest"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably/proto"
)

func expectMsg(ch <-chan *proto.Message, name string, data interface{}, t time.Duration, received bool) error {
Expand Down
4 changes: 2 additions & 2 deletions ably/realtime_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"sync"
"testing"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/ablytest"
)

func TestRealtimeClient_RealtimeHost(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions ably/realtime_conn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strconv"
"time"

"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably/proto"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions ably/realtime_conn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/ablytest"
)

func await(fn func() ably.StateEnum, state ably.StateEnum) error {
Expand Down
2 changes: 1 addition & 1 deletion ably/realtime_presence.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"sync"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"
)

type syncState uint8
Expand Down
6 changes: 3 additions & 3 deletions ably/realtime_presence_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"
"time"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/ablytest"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably/proto"
)

func contains(members []*proto.PresenceMessage, clients ...string) error {
Expand Down
4 changes: 2 additions & 2 deletions ably/rest_channel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"

"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/proto"
)

// based on HttpUtils::encodeURIComponent from ably-java library
Expand Down
14 changes: 7 additions & 7 deletions ably/rest_channel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"strings"
"testing"

"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/ablytest"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably/proto"
)

func TestRestChannel(t *testing.T) {
Expand Down Expand Up @@ -206,7 +206,7 @@ func TestIdempotentPublishing(t *testing.T) {
t.Fatal(err)
}
defer app.Close()
options := app.Options(&ably.ClientOptions{IdempotentRestPublishing:true})
options := app.Options(&ably.ClientOptions{IdempotentRestPublishing: true})
client, err := ably.NewRestClient(options)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -428,8 +428,8 @@ func TestIdempotent_retry(t *testing.T) {
}))

nopts := &ably.ClientOptions{
NoTLS: true,
FallbackHostsUseDefault: true,
NoTLS: true,
FallbackHostsUseDefault: true,
IdempotentRestPublishing: true,
AuthOptions: ably.AuthOptions{
UseTokenAuth: true,
Expand Down
4 changes: 2 additions & 2 deletions ably/rest_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"sync"
"time"

"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably/proto"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions ably/rest_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"testing"
"time"

"github.com/ably/ably-go/ably"
"github.com/ably/ably-go/ably/ablytest"
"github.com/ably/ably-go/ably/internal/ablyutil"
"github.com/ably/ably-go/ably/proto"
"github.com/DavidHuie/ably-go/ably"
"github.com/DavidHuie/ably-go/ably/ablytest"
"github.com/DavidHuie/ably-go/ably/internal/ablyutil"
"github.com/DavidHuie/ably-go/ably/proto"
)

func newHTTPClientMock(srv *httptest.Server) *http.Client {
Expand Down
Loading

0 comments on commit 3d377b6

Please sign in to comment.