Update github.com/pion/transport to v2

stv0g · stv0g · commit 3dca8e49b7af · 2023-01-24T04:36:53.000+01:00
diff --git a/bench_test.go b/bench_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pion/dtls/v2/internal/net/dpipe"
 	"github.com/pion/dtls/v2/pkg/crypto/selfsign"
 	"github.com/pion/logging"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 func TestSimpleReadWrite(t *testing.T) {
diff --git a/cipher_suite_test.go b/cipher_suite_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pion/dtls/v2/internal/ciphersuite"
 	"github.com/pion/dtls/v2/internal/net/dpipe"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 func TestCipherSuiteName(t *testing.T) {
diff --git a/conn.go b/conn.go
@@ -18,9 +18,9 @@ import (
 	"github.com/pion/dtls/v2/pkg/protocol/handshake"
 	"github.com/pion/dtls/v2/pkg/protocol/recordlayer"
 	"github.com/pion/logging"
-	"github.com/pion/transport/connctx"
-	"github.com/pion/transport/deadline"
-	"github.com/pion/transport/replaydetector"
+	"github.com/pion/transport/v2/connctx"
+	"github.com/pion/transport/v2/deadline"
+	"github.com/pion/transport/v2/replaydetector"
 )
 
 const (
diff --git a/conn_go_test.go b/conn_go_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/pion/dtls/v2/internal/net/dpipe"
 	"github.com/pion/dtls/v2/pkg/crypto/selfsign"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 func TestContextConfig(t *testing.T) {
diff --git a/conn_test.go b/conn_test.go
@@ -33,7 +33,7 @@ import (
 	"github.com/pion/dtls/v2/pkg/protocol/extension"
 	"github.com/pion/dtls/v2/pkg/protocol/handshake"
 	"github.com/pion/dtls/v2/pkg/protocol/recordlayer"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 var (
diff --git a/e2e/e2e_lossy_test.go b/e2e/e2e_lossy_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pion/dtls/v2"
 	"github.com/pion/dtls/v2/pkg/crypto/selfsign"
-	transportTest "github.com/pion/transport/test"
+	transportTest "github.com/pion/transport/v2/test"
 )
 
 const (
@@ -18,7 +18,7 @@ const (
 )
 
 /*
-  DTLS Client/Server over a lossy transport, just asserts it can handle at increasing increments
+DTLS Client/Server over a lossy transport, just asserts it can handle at increasing increments
 */
 func TestPionE2ELossy(t *testing.T) {
 	// Check for leaking routines
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/pion/dtls/v2"
 	"github.com/pion/dtls/v2/pkg/crypto/selfsign"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 const (
@@ -217,10 +217,10 @@ func serverPion(c *comm) {
 }
 
 /*
-  Simple DTLS Client/Server can communicate
-    - Assert that you can send messages both ways
-	- Assert that Close() on both ends work
-	- Assert that no Goroutines are leaked
+	  Simple DTLS Client/Server can communicate
+	    - Assert that you can send messages both ways
+		- Assert that Close() on both ends work
+		- Assert that no Goroutines are leaked
 */
 func testPionE2ESimple(t *testing.T, server, client func(*comm)) {
 	lim := test.TimeOut(time.Second * 30)
diff --git a/flight4handler_test.go b/flight4handler_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pion/dtls/v2/internal/ciphersuite"
 	"github.com/pion/dtls/v2/pkg/protocol/alert"
 	"github.com/pion/dtls/v2/pkg/protocol/handshake"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 type flight4TestMockFlightConn struct{}
diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/pion/dtls/v2
 
 require (
 	github.com/pion/logging v0.2.2
-	github.com/pion/transport v0.14.1
+	github.com/pion/transport/v2 v2.0.0
 	github.com/pion/udp v0.1.2
 	golang.org/x/crypto v0.4.0
 	golang.org/x/net v0.4.0
diff --git a/go.sum b/go.sum
@@ -1,16 +1,23 @@
-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=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
 github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40=
 github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI=
+github.com/pion/transport/v2 v2.0.0 h1:bsMYyqHCbkvHwj+eNCFBuxtlKndKfyGI2vaQmM3fIE4=
+github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc=
 github.com/pion/udp v0.1.2 h1:Bl1ifOcoVYg9gnk1+9yyTX8XgAUORiDvM7UqBb3skhg=
 github.com/pion/udp v0.1.2/go.mod h1:CuqU2J4MmF3sjqKfk1SaIhuNXdum5PJRqd2LHuLMQSk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -49,5 +56,6 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/handshaker_test.go b/handshaker_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/pion/dtls/v2/pkg/protocol/handshake"
 	"github.com/pion/dtls/v2/pkg/protocol/recordlayer"
 	"github.com/pion/logging"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 const nonZeroRetransmitInterval = 100 * time.Millisecond
diff --git a/internal/net/dpipe/dpipe.go b/internal/net/dpipe/dpipe.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pion/transport/deadline"
+	"github.com/pion/transport/v2/deadline"
 )
 
 // Pipe creates pair of non-stream conn on memory.
diff --git a/nettest_test.go b/nettest_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 	"golang.org/x/net/nettest"
 )
 
diff --git a/replayprotection_test.go b/replayprotection_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/pion/dtls/v2/internal/net/dpipe"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 func TestReplayProtection(t *testing.T) {
diff --git a/resume_test.go b/resume_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/pion/dtls/v2/pkg/crypto/selfsign"
-	"github.com/pion/transport/test"
+	"github.com/pion/transport/v2/test"
 )
 
 var errMessageMissmatch = errors.New("messages missmatch")
diff --git a/state.go b/state.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pion/dtls/v2/pkg/crypto/elliptic"
 	"github.com/pion/dtls/v2/pkg/crypto/prf"
 	"github.com/pion/dtls/v2/pkg/protocol/handshake"
-	"github.com/pion/transport/replaydetector"
+	"github.com/pion/transport/v2/replaydetector"
 )
 
 // State holds the dtls connection state and implements both encoding.BinaryMarshaler and encoding.BinaryUnmarshaler

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/pion/dtls/v2/internal/net/dpipe"`
`11`	`11`	`"github.com/pion/dtls/v2/pkg/crypto/selfsign"`
`12`	`12`	`"github.com/pion/logging"`
`13`		`- "github.com/pion/transport/test"`
	`13`	`+ "github.com/pion/transport/v2/test"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestSimpleReadWrite(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/pion/dtls/v2/internal/ciphersuite"`
`9`	`9`	`"github.com/pion/dtls/v2/internal/net/dpipe"`
`10`		`- "github.com/pion/transport/test"`
	`10`	`+ "github.com/pion/transport/v2/test"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestCipherSuiteName(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`"github.com/pion/dtls/v2/internal/net/dpipe"`
`16`	`16`	`"github.com/pion/dtls/v2/pkg/crypto/selfsign"`
`17`		`- "github.com/pion/transport/test"`
	`17`	`+ "github.com/pion/transport/v2/test"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func TestContextConfig(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import (`
`33`	`33`	`"github.com/pion/dtls/v2/pkg/protocol/extension"`
`34`	`34`	`"github.com/pion/dtls/v2/pkg/protocol/handshake"`
`35`	`35`	`"github.com/pion/dtls/v2/pkg/protocol/recordlayer"`
`36`		`- "github.com/pion/transport/test"`
	`36`	`+ "github.com/pion/transport/v2/test"`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/pion/dtls/v2"`
`11`	`11`	`"github.com/pion/dtls/v2/pkg/crypto/selfsign"`
`12`		`- transportTest "github.com/pion/transport/test"`
	`12`	`+ transportTest "github.com/pion/transport/v2/test"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
`@@ -18,7 +18,7 @@ const (`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`/*`
`21`		`- DTLS Client/Server over a lossy transport, just asserts it can handle at increasing increments`
	`21`	`+DTLS Client/Server over a lossy transport, just asserts it can handle at increasing increments`
`22`	`22`	`*/`
`23`	`23`	`func TestPionE2ELossy(t *testing.T) {`
`24`	`24`	`// Check for leaking routines`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/pion/dtls/v2/internal/ciphersuite"`
`9`	`9`	`"github.com/pion/dtls/v2/pkg/protocol/alert"`
`10`	`10`	`"github.com/pion/dtls/v2/pkg/protocol/handshake"`
`11`		`- "github.com/pion/transport/test"`
	`11`	`+ "github.com/pion/transport/v2/test"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type flight4TestMockFlightConn struct{}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"github.com/pion/dtls/v2/pkg/protocol/handshake"`
`17`	`17`	`"github.com/pion/dtls/v2/pkg/protocol/recordlayer"`
`18`	`18`	`"github.com/pion/logging"`
`19`		`- "github.com/pion/transport/test"`
	`19`	`+ "github.com/pion/transport/v2/test"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`const nonZeroRetransmitInterval = 100 * time.Millisecond`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"sync"`
`9`	`9`	`"time"`
`10`	`10`
`11`		`- "github.com/pion/transport/deadline"`
	`11`	`+ "github.com/pion/transport/v2/deadline"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// Pipe creates pair of non-stream conn on memory.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"testing"`
`9`	`9`	`"time"`
`10`	`10`
`11`		`- "github.com/pion/transport/test"`
	`11`	`+ "github.com/pion/transport/v2/test"`
`12`	`12`	`"golang.org/x/net/nettest"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"time"`
`12`	`12`
`13`	`13`	`"github.com/pion/dtls/v2/pkg/crypto/selfsign"`
`14`		`- "github.com/pion/transport/test"`
	`14`	`+ "github.com/pion/transport/v2/test"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`var errMessageMissmatch = errors.New("messages missmatch")`