From 804e558e967ea325c5a5db402deb78c3a6afbb3f Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 31 Aug 2020 13:58:28 +0200 Subject: [PATCH] Switch to builtin "context" package now that we can assume Go 1.7 --- src/proxy/proxy_server.go | 3 +-- src/proxy/proxy_session.go | 3 +-- src/signaling/backend_client.go | 2 +- src/signaling/backend_client_test.go | 2 +- src/signaling/backend_server_test.go | 3 +-- src/signaling/clientsession.go | 3 +-- src/signaling/hub.go | 3 +-- src/signaling/hub_test.go | 3 +-- src/signaling/janus_client.go | 3 +-- src/signaling/mcu_common.go | 3 +-- src/signaling/mcu_janus.go | 3 +-- src/signaling/mcu_proxy.go | 3 +-- src/signaling/mcu_test.go | 3 +-- src/signaling/natsclient_loopback.go | 3 +-- src/signaling/natsclient_loopback_test.go | 3 +-- src/signaling/pool.go | 3 +-- src/signaling/pool_test.go | 3 +-- src/signaling/room.go | 3 +-- src/signaling/room_test.go | 3 +-- src/signaling/testclient_test.go | 3 +-- 20 files changed, 20 insertions(+), 38 deletions(-) diff --git a/src/proxy/proxy_server.go b/src/proxy/proxy_server.go index 14ad52c..4f6d8fc 100644 --- a/src/proxy/proxy_server.go +++ b/src/proxy/proxy_server.go @@ -22,6 +22,7 @@ package main import ( + "context" "encoding/json" "fmt" "log" @@ -42,8 +43,6 @@ import ( "github.com/gorilla/securecookie" "github.com/gorilla/websocket" - "golang.org/x/net/context" - "gopkg.in/dgrijalva/jwt-go.v3" "signaling" diff --git a/src/proxy/proxy_session.go b/src/proxy/proxy_session.go index ebbb85d..ea91949 100644 --- a/src/proxy/proxy_session.go +++ b/src/proxy/proxy_session.go @@ -22,13 +22,12 @@ package main import ( + "context" "log" "sync" "sync/atomic" "time" - "golang.org/x/net/context" - "signaling" ) diff --git a/src/signaling/backend_client.go b/src/signaling/backend_client.go index 89b4cd7..a66979b 100644 --- a/src/signaling/backend_client.go +++ b/src/signaling/backend_client.go @@ -23,6 +23,7 @@ package signaling import ( "bytes" + "context" "crypto/tls" "encoding/json" "fmt" @@ -35,7 +36,6 @@ import ( "sync" "github.com/dlintw/goconf" - "golang.org/x/net/context" "golang.org/x/net/context/ctxhttp" ) diff --git a/src/signaling/backend_client_test.go b/src/signaling/backend_client_test.go index 073ed04..b2bb1be 100644 --- a/src/signaling/backend_client_test.go +++ b/src/signaling/backend_client_test.go @@ -22,6 +22,7 @@ package signaling import ( + "context" "encoding/json" "io/ioutil" "net/http" @@ -32,7 +33,6 @@ import ( "github.com/dlintw/goconf" "github.com/gorilla/mux" - "golang.org/x/net/context" ) func TestPostOnRedirect(t *testing.T) { diff --git a/src/signaling/backend_server_test.go b/src/signaling/backend_server_test.go index 36a7834..d04c9e3 100644 --- a/src/signaling/backend_server_test.go +++ b/src/signaling/backend_server_test.go @@ -23,6 +23,7 @@ package signaling import ( "bytes" + "context" "crypto/hmac" "crypto/sha1" "encoding/base64" @@ -42,8 +43,6 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" "github.com/nats-io/go-nats" - - "golang.org/x/net/context" ) var ( diff --git a/src/signaling/clientsession.go b/src/signaling/clientsession.go index 8a0b496..85cfe5a 100644 --- a/src/signaling/clientsession.go +++ b/src/signaling/clientsession.go @@ -22,6 +22,7 @@ package signaling import ( + "context" "encoding/json" "log" "net/url" @@ -31,8 +32,6 @@ import ( "unsafe" "github.com/nats-io/go-nats" - - "golang.org/x/net/context" ) var ( diff --git a/src/signaling/hub.go b/src/signaling/hub.go index a284900..a72c197 100644 --- a/src/signaling/hub.go +++ b/src/signaling/hub.go @@ -22,6 +22,7 @@ package signaling import ( + "context" "crypto/hmac" "crypto/sha256" "encoding/base64" @@ -41,8 +42,6 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/securecookie" "github.com/gorilla/websocket" - - "golang.org/x/net/context" ) var ( diff --git a/src/signaling/hub_test.go b/src/signaling/hub_test.go index 4e17cbc..4ba9e15 100644 --- a/src/signaling/hub_test.go +++ b/src/signaling/hub_test.go @@ -22,6 +22,7 @@ package signaling import ( + "context" "encoding/json" "io/ioutil" "net/http" @@ -36,8 +37,6 @@ import ( "github.com/dlintw/goconf" "github.com/gorilla/mux" "github.com/gorilla/websocket" - - "golang.org/x/net/context" ) const ( diff --git a/src/signaling/janus_client.go b/src/signaling/janus_client.go index f0d258b..9c00206 100644 --- a/src/signaling/janus_client.go +++ b/src/signaling/janus_client.go @@ -30,6 +30,7 @@ package signaling import ( "bytes" + "context" "encoding/json" "fmt" "log" @@ -41,8 +42,6 @@ import ( "github.com/gorilla/websocket" "github.com/notedit/janus-go" - - "golang.org/x/net/context" ) const ( diff --git a/src/signaling/mcu_common.go b/src/signaling/mcu_common.go index 33c4d58..f30b851 100644 --- a/src/signaling/mcu_common.go +++ b/src/signaling/mcu_common.go @@ -22,11 +22,10 @@ package signaling import ( + "context" "fmt" "github.com/dlintw/goconf" - - "golang.org/x/net/context" ) const ( diff --git a/src/signaling/mcu_janus.go b/src/signaling/mcu_janus.go index 8338fb4..50d53b7 100644 --- a/src/signaling/mcu_janus.go +++ b/src/signaling/mcu_janus.go @@ -22,6 +22,7 @@ package signaling import ( + "context" "encoding/json" "fmt" "log" @@ -34,8 +35,6 @@ import ( "github.com/dlintw/goconf" "github.com/nats-io/go-nats" "github.com/notedit/janus-go" - - "golang.org/x/net/context" ) const ( diff --git a/src/signaling/mcu_proxy.go b/src/signaling/mcu_proxy.go index 1a9e39c..11fa113 100644 --- a/src/signaling/mcu_proxy.go +++ b/src/signaling/mcu_proxy.go @@ -22,6 +22,7 @@ package signaling import ( + "context" "crypto/rsa" "encoding/json" "fmt" @@ -38,8 +39,6 @@ import ( "github.com/dlintw/goconf" "github.com/gorilla/websocket" - "golang.org/x/net/context" - "gopkg.in/dgrijalva/jwt-go.v3" ) diff --git a/src/signaling/mcu_test.go b/src/signaling/mcu_test.go index 84b4ed6..102fd3a 100644 --- a/src/signaling/mcu_test.go +++ b/src/signaling/mcu_test.go @@ -22,11 +22,10 @@ package signaling import ( + "context" "fmt" "github.com/dlintw/goconf" - - "golang.org/x/net/context" ) type TestMCU struct { diff --git a/src/signaling/natsclient_loopback.go b/src/signaling/natsclient_loopback.go index 42476e5..e4dc1c6 100644 --- a/src/signaling/natsclient_loopback.go +++ b/src/signaling/natsclient_loopback.go @@ -22,6 +22,7 @@ package signaling import ( + "context" "encoding/json" "strconv" "strings" @@ -29,8 +30,6 @@ import ( "time" "github.com/nats-io/go-nats" - - "golang.org/x/net/context" ) type LoopbackNatsClient struct { diff --git a/src/signaling/natsclient_loopback_test.go b/src/signaling/natsclient_loopback_test.go index 680efed..134e222 100644 --- a/src/signaling/natsclient_loopback_test.go +++ b/src/signaling/natsclient_loopback_test.go @@ -23,14 +23,13 @@ package signaling import ( "bytes" + "context" "runtime" "sync/atomic" "testing" "time" "github.com/nats-io/go-nats" - - "golang.org/x/net/context" ) func (c *LoopbackNatsClient) waitForSubscriptionsEmpty(ctx context.Context, t *testing.T) { diff --git a/src/signaling/pool.go b/src/signaling/pool.go index 7335c29..ef857bf 100644 --- a/src/signaling/pool.go +++ b/src/signaling/pool.go @@ -22,10 +22,9 @@ package signaling import ( + "context" "fmt" "net/http" - - "golang.org/x/net/context" ) type HttpClientPool struct { diff --git a/src/signaling/pool_test.go b/src/signaling/pool_test.go index b861e0e..d3f073b 100644 --- a/src/signaling/pool_test.go +++ b/src/signaling/pool_test.go @@ -22,11 +22,10 @@ package signaling import ( + "context" "net/http" "testing" "time" - - "golang.org/x/net/context" ) func TestHttpClientPool(t *testing.T) { diff --git a/src/signaling/room.go b/src/signaling/room.go index aebe118..f7a928e 100644 --- a/src/signaling/room.go +++ b/src/signaling/room.go @@ -23,6 +23,7 @@ package signaling import ( "bytes" + "context" "encoding/json" "log" "net/url" @@ -30,8 +31,6 @@ import ( "time" "github.com/nats-io/go-nats" - - "golang.org/x/net/context" ) const ( diff --git a/src/signaling/room_test.go b/src/signaling/room_test.go index 3a127f3..e7463ad 100644 --- a/src/signaling/room_test.go +++ b/src/signaling/room_test.go @@ -23,6 +23,7 @@ package signaling import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -30,8 +31,6 @@ import ( "time" "github.com/gorilla/websocket" - - "golang.org/x/net/context" ) func TestRoom_InCall(t *testing.T) { diff --git a/src/signaling/testclient_test.go b/src/signaling/testclient_test.go index 4ae5681..bdacaeb 100644 --- a/src/signaling/testclient_test.go +++ b/src/signaling/testclient_test.go @@ -22,6 +22,7 @@ package signaling import ( + "context" "crypto/hmac" "crypto/sha256" "encoding/hex" @@ -34,8 +35,6 @@ import ( "time" "github.com/gorilla/websocket" - - "golang.org/x/net/context" ) var (