Skip to content

Commit

Permalink
Merge pull request #97 from steamraven/dep-net
Browse files Browse the repository at this point in the history
Dependency: Remove deprecated multiaddr-net
  • Loading branch information
Stebalien authored Oct 26, 2020
2 parents d4006ef + a0f24eb commit abec414
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion p2p/transport/websocket/addrs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/url"

ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr-net"
manet "github.com/multiformats/go-multiaddr/net"
)

// Addr is an implementation of net.Addr for WebSocket.
Expand Down
2 changes: 1 addition & 1 deletion p2p/transport/websocket/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"

ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr-net"
manet "github.com/multiformats/go-multiaddr/net"
)

type listener struct {
Expand Down
2 changes: 1 addition & 1 deletion p2p/transport/websocket/websocket.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
tptu "github.com/libp2p/go-libp2p-transport-upgrader"
ma "github.com/multiformats/go-multiaddr"
mafmt "github.com/multiformats/go-multiaddr-fmt"
manet "github.com/multiformats/go-multiaddr-net"
manet "github.com/multiformats/go-multiaddr/net"
)

// WsProtocol is the multiaddr protocol definition for this transport.
Expand Down
2 changes: 1 addition & 1 deletion p2p/transport/websocket/websocket_browser.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/libp2p/go-libp2p-core/transport"
ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr-net"
manet "github.com/multiformats/go-multiaddr/net"
)

func (t *WebsocketTransport) maDial(ctx context.Context, raddr ma.Multiaddr) (manet.Conn, error) {
Expand Down
2 changes: 1 addition & 1 deletion p2p/transport/websocket/websocket_native.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
ws "github.com/gorilla/websocket"
"github.com/libp2p/go-libp2p-core/transport"
ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr-net"
manet "github.com/multiformats/go-multiaddr/net"
)

// Default gorilla upgrader
Expand Down

0 comments on commit abec414

Please sign in to comment.