From 5d30be412b0f9181cb007c8893ee583ee4319116 Mon Sep 17 00:00:00 2001 From: Ralph Caraveo III Date: Mon, 16 Jul 2018 00:54:19 -0700 Subject: all: switch out defunct set library to different one (#16873) * keystore, ethash, eth, miner, rpc, whisperv6: tech debt with now defunct set. * whisperv5: swap out gopkg.in/fatih/set.v0 with supported set --- rpc/websocket.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'rpc/websocket.go') diff --git a/rpc/websocket.go b/rpc/websocket.go index a6e1cec28..e7a86ddae 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -29,9 +29,9 @@ import ( "strings" "time" + mapset "github.com/deckarep/golang-set" "github.com/ethereum/go-ethereum/log" "golang.org/x/net/websocket" - "gopkg.in/fatih/set.v0" ) // websocketJSONCodec is a custom JSON codec with payload size enforcement and @@ -84,7 +84,7 @@ func NewWSServer(allowedOrigins []string, srv *Server) *http.Server { // websocket upgrade process. When a '*' is specified as an allowed origins all // connections are accepted. func wsHandshakeValidator(allowedOrigins []string) func(*websocket.Config, *http.Request) error { - origins := set.New() + origins := mapset.NewSet() allowAllOrigins := false for _, origin := range allowedOrigins { @@ -97,18 +97,18 @@ func wsHandshakeValidator(allowedOrigins []string) func(*websocket.Config, *http } // allow localhost if no allowedOrigins are specified. - if len(origins.List()) == 0 { + if len(origins.ToSlice()) == 0 { origins.Add("http://localhost") if hostname, err := os.Hostname(); err == nil { origins.Add("http://" + strings.ToLower(hostname)) } } - log.Debug(fmt.Sprintf("Allowed origin(s) for WS RPC interface %v\n", origins.List())) + log.Debug(fmt.Sprintf("Allowed origin(s) for WS RPC interface %v\n", origins.ToSlice())) f := func(cfg *websocket.Config, req *http.Request) error { origin := strings.ToLower(req.Header.Get("Origin")) - if allowAllOrigins || origins.Has(origin) { + if allowAllOrigins || origins.Contains(origin) { return nil } log.Warn(fmt.Sprintf("origin '%s' not allowed on WS-RPC interface\n", origin)) -- cgit v1.2.3