Skip to content

Commit bb346a3

Browse files
fjlfjl
committed
rpc/ws: switch to golang.org/x/net
code.google.com/p/go.net is deprecated and will cause problems in future versions of Go.
1 parent 34d0e1b commit bb346a3

File tree

10 files changed

+96
-10
lines changed

10 files changed

+96
-10
lines changed

‎Godeps/Godeps.json‎

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/code.google.com/p/go.net/websocket/client.go‎ renamed to ‎Godeps/_workspace/src/golang.org/x/net/websocket/client.go‎

Lines changed: 16 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go‎ renamed to ‎Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go‎ renamed to ‎Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi.go‎ renamed to ‎Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go‎

File renamed without changes.

‎Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi_test.go‎ renamed to ‎Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go‎

File renamed without changes.

‎Godeps/_workspace/src/code.google.com/p/go.net/websocket/server.go‎ renamed to ‎Godeps/_workspace/src/golang.org/x/net/websocket/server.go‎

File renamed without changes.

‎Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket.go‎ renamed to ‎Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go‎

File renamed without changes.

‎Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket_test.go‎ renamed to ‎Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go‎

Lines changed: 73 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rpc/ws/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"net"
2222
"net/http"
2323

24-
"code.google.com/p/go.net/websocket"
2524
"github.com/ethereum/go-ethereum/logger"
2625
"github.com/ethereum/go-ethereum/rpc"
2726
"github.com/ethereum/go-ethereum/xeth"
27+
"golang.org/x/net/websocket"
2828
)
2929

3030
var wslogger = logger.NewLogger("RPC-WS")

0 commit comments

Comments
 (0)