diff --git a/examples/vnet/show-network-usage/main.go b/examples/vnet/show-network-usage/main.go index 5b8a1d79aee..d7a12fb808a 100644 --- a/examples/vnet/show-network-usage/main.go +++ b/examples/vnet/show-network-usage/main.go @@ -96,7 +96,7 @@ func main() { panicIfError(wan.AddNet(offerVNet)) offerSettingEngine := webrtc.SettingEngine{} - offerSettingEngine.SetVNet(offerVNet) + offerSettingEngine.SetNet(offerVNet) offerAPI := webrtc.NewAPI(webrtc.WithSettingEngine(offerSettingEngine)) // Create a network interface for answerer @@ -109,7 +109,7 @@ func main() { panicIfError(wan.AddNet(answerVNet)) answerSettingEngine := webrtc.SettingEngine{} - answerSettingEngine.SetVNet(answerVNet) + answerSettingEngine.SetNet(answerVNet) answerAPI := webrtc.NewAPI(webrtc.WithSettingEngine(answerSettingEngine)) // Start the virtual network by calling Start() on the root router diff --git a/peerconnection_renegotiation_test.go b/peerconnection_renegotiation_test.go index e7f245d27c9..0dec5bec2f0 100644 --- a/peerconnection_renegotiation_test.go +++ b/peerconnection_renegotiation_test.go @@ -1204,9 +1204,9 @@ func TestPeerConnection_Renegotiation_MidConflict(t *testing.T) { _, err = offerPC.CreateDataChannel("test", nil) assert.NoError(t, err) - _, err = offerPC.AddTransceiverFromKind(RTPCodecTypeVideo, RtpTransceiverInit{Direction: RTPTransceiverDirectionSendonly}) + _, err = offerPC.AddTransceiverFromKind(RTPCodecTypeVideo, RTPTransceiverInit{Direction: RTPTransceiverDirectionSendonly}) assert.NoError(t, err) - _, err = offerPC.AddTransceiverFromKind(RTPCodecTypeAudio, RtpTransceiverInit{Direction: RTPTransceiverDirectionSendonly}) + _, err = offerPC.AddTransceiverFromKind(RTPCodecTypeAudio, RTPTransceiverInit{Direction: RTPTransceiverDirectionSendonly}) assert.NoError(t, err) offer, err := offerPC.CreateOffer(nil) @@ -1219,10 +1219,10 @@ func TestPeerConnection_Renegotiation_MidConflict(t *testing.T) { assert.NoError(t, offerPC.SetRemoteDescription(answer)) assert.Equal(t, SignalingStateStable, offerPC.SignalingState()) - tr, err := offerPC.AddTransceiverFromKind(RTPCodecTypeVideo, RtpTransceiverInit{Direction: RTPTransceiverDirectionSendonly}) + tr, err := offerPC.AddTransceiverFromKind(RTPCodecTypeVideo, RTPTransceiverInit{Direction: RTPTransceiverDirectionSendonly}) assert.NoError(t, err) assert.NoError(t, tr.SetMid("3")) - _, err = offerPC.AddTransceiverFromKind(RTPCodecTypeVideo, RtpTransceiverInit{Direction: RTPTransceiverDirectionSendrecv}) + _, err = offerPC.AddTransceiverFromKind(RTPCodecTypeVideo, RTPTransceiverInit{Direction: RTPTransceiverDirectionSendrecv}) assert.NoError(t, err) _, err = offerPC.CreateOffer(nil) assert.NoError(t, err) @@ -1257,13 +1257,13 @@ func TestPeerConnection_Regegotiation_AnswerAddsTrack(t *testing.T) { assert.NoError(t, err) assert.NoError(t, signalPair(pcOffer, pcAnswer)) - _, err = pcOffer.AddTransceiverFromKind(RTPCodecTypeVideo, RtpTransceiverInit{ + _, err = pcOffer.AddTransceiverFromKind(RTPCodecTypeVideo, RTPTransceiverInit{ Direction: RTPTransceiverDirectionRecvonly, }) assert.NoError(t, err) assert.NoError(t, signalPair(pcOffer, pcAnswer)) - _, err = pcAnswer.AddTransceiverFromKind(RTPCodecTypeVideo, RtpTransceiverInit{ + _, err = pcAnswer.AddTransceiverFromKind(RTPCodecTypeVideo, RTPTransceiverInit{ Direction: RTPTransceiverDirectionSendonly, }) assert.NoError(t, err) diff --git a/rtptransceiverinit.go b/rtptransceiverinit.go index 3aac1dc14cd..1ad9bb606df 100644 --- a/rtptransceiverinit.go +++ b/rtptransceiverinit.go @@ -9,7 +9,3 @@ type RTPTransceiverInit struct { SendEncodings []RTPEncodingParameters // Streams []*Track } - -// RtpTransceiverInit is a temporary mapping while we fix case sensitivity -// Deprecated: Use RTPTransceiverInit instead -type RtpTransceiverInit = RTPTransceiverInit //nolint: stylecheck,golint diff --git a/settingengine.go b/settingengine.go index a9eb1036419..1487b8fe6c0 100644 --- a/settingengine.go +++ b/settingengine.go @@ -19,7 +19,6 @@ import ( "github.com/pion/logging" "github.com/pion/transport/v3" "github.com/pion/transport/v3/packetio" - "github.com/pion/transport/v3/vnet" "golang.org/x/net/proxy" ) @@ -254,16 +253,6 @@ func (e *SettingEngine) SetAnsweringDTLSRole(role DTLSRole) error { return nil } -// SetVNet sets the VNet instance that is passed to pion/ice -// -// VNet is a virtual network layer for Pion, allowing users to simulate -// different topologies, latency, loss and jitter. This can be useful for -// learning WebRTC concepts or testing your application in a lab environment -// Deprecated: Please use SetNet() -func (e *SettingEngine) SetVNet(vnet *vnet.Net) { - e.SetNet(vnet) -} - // SetNet sets the Net instance that is passed to pion/ice // // Net is an network interface layer for Pion, allowing users to replace diff --git a/vnet_test.go b/vnet_test.go index df8f0e7070b..047ce56ffa2 100644 --- a/vnet_test.go +++ b/vnet_test.go @@ -33,7 +33,7 @@ func createVNetPair(t *testing.T) (*PeerConnection, *PeerConnection, *vnet.Route assert.NoError(t, wan.AddNet(offerVNet)) offerSettingEngine := SettingEngine{} - offerSettingEngine.SetVNet(offerVNet) + offerSettingEngine.SetNet(offerVNet) offerSettingEngine.SetICETimeouts(time.Second, time.Second, time.Millisecond*200) // Create a network interface for answerer @@ -46,7 +46,7 @@ func createVNetPair(t *testing.T) (*PeerConnection, *PeerConnection, *vnet.Route assert.NoError(t, wan.AddNet(answerVNet)) answerSettingEngine := SettingEngine{} - answerSettingEngine.SetVNet(answerVNet) + answerSettingEngine.SetNet(answerVNet) answerSettingEngine.SetICETimeouts(time.Second, time.Second, time.Millisecond*200) // Start the virtual network by calling Start() on the root router