Skip to content

Commit

Permalink
undeprecate rid
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ulexus
Ulexus committed Mar 8, 2020
1 parent 3725261 commit edbc162
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion _examples/bridge/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/inconshreveable/log15"

"github.com/CyCoreSystems/ari-proxy/v5/client"
rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5"
"github.com/CyCoreSystems/ari/v5/ext/play"
"github.com/CyCoreSystems/ari/v5/rid"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion client/bridge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package client

import (
"github.com/CyCoreSystems/ari-proxy/v5/proxy"
rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5"
"github.com/CyCoreSystems/ari/v5/rid"
)

type bridge struct {
Expand Down
2 changes: 1 addition & 1 deletion client/channel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"time"

"github.com/CyCoreSystems/ari-proxy/v5/proxy"
rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5"
"github.com/CyCoreSystems/ari/v5/rid"
)

type channel struct {
Expand Down
2 changes: 1 addition & 1 deletion client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/CyCoreSystems/ari-proxy/v5/client/bus"
"github.com/CyCoreSystems/ari-proxy/v5/client/cluster"
"github.com/CyCoreSystems/ari-proxy/v5/proxy"
rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5"
"github.com/CyCoreSystems/ari/v5/rid"

"github.com/inconshreveable/log15"
"github.com/nats-io/nats.go"
Expand Down
2 changes: 1 addition & 1 deletion client/clientserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/CyCoreSystems/ari-proxy/v5/server"
rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5"
"github.com/CyCoreSystems/ari/v5/rid"
"github.com/nats-io/nats.go"
)

Expand Down
2 changes: 1 addition & 1 deletion client/cluster/cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5/rid"
)

func TestHash(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ go 1.13

require (
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/CyCoreSystems/ari-rid v0.1.0
github.com/CyCoreSystems/ari/v5 v5.0.3
github.com/CyCoreSystems/ari/v5 v5.0.5
github.com/fsnotify/fsnotify v0.0.0-20170329110642-4da3e2cfbabc // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/hashicorp/hcl v0.0.0-20170509225359-392dba7d905e // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/CyCoreSystems/ari-rid v0.1.0 h1:QSn7/1Jc0b3Se/LIaMa9taGxC9n/zyBlCEw9Conrdrk=
github.com/CyCoreSystems/ari-rid v0.1.0/go.mod h1:vFD6moqOBGXaUM28Yck9X16+5cj+NbFmiyCvpUYuKr4=
github.com/CyCoreSystems/ari/v5 v5.0.3 h1:WF0J0lA4uSgV5Sk9t3V0vtRh6NPonYeRoHTJVXMMMzE=
github.com/CyCoreSystems/ari/v5 v5.0.3/go.mod h1:5fdxhNmHG+sUJkeIgPfMafi7d7Ec1B8QpPSCFvDDVc0=
github.com/CyCoreSystems/ari/v5 v5.0.5 h1:+BiHa2wV9jAYPh7tE6Utrmb0520y62Cu354ANww43YQ=
github.com/CyCoreSystems/ari/v5 v5.0.5/go.mod h1:5fdxhNmHG+sUJkeIgPfMafi7d7Ec1B8QpPSCFvDDVc0=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down
2 changes: 1 addition & 1 deletion internal/integration/channel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5"
"github.com/CyCoreSystems/ari/v5/rid"
tmock "github.com/stretchr/testify/mock"
)

Expand Down
2 changes: 1 addition & 1 deletion server/bridge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

"github.com/CyCoreSystems/ari-proxy/v5/proxy"
rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5"
"github.com/CyCoreSystems/ari/v5/rid"
)

func (s *Server) bridgeAddChannel(ctx context.Context, reply string, req *proxy.Request) {
Expand Down
2 changes: 1 addition & 1 deletion server/channel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"

"github.com/CyCoreSystems/ari-proxy/v5/proxy"
rid "github.com/CyCoreSystems/ari-rid"
"github.com/CyCoreSystems/ari/v5"
"github.com/CyCoreSystems/ari/v5/rid"
)

func (s *Server) channelAnswer(ctx context.Context, reply string, req *proxy.Request) {
Expand Down

0 comments on commit edbc162

Please sign in to comment.