Skip to content

Commit 9f0d0d6

Browse files
jiyeyuranjiyeyuran
committed
cosmetic
1 parent 367288b commit 9f0d0d6

15 files changed

+198
-185
lines changed

‎consumer_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ func (suite *ConsumerTestingSuite) SetupTest() {
138138
suite.worker = CreateTestWorker()
139139
suite.router, _ = suite.worker.CreateRouter(RouterOptions{MediaCodecs: mediaCodecs})
140140

141-
suite.transport1, _ = suite.router.CreateWebRtcTransport(func(o *WebRtcTransportOptions) {
142-
o.ListenIps = []TransportListenIp{
141+
suite.transport1, _ = suite.router.CreateWebRtcTransport(WebRtcTransportOptions{
142+
ListenIps: []TransportListenIp{
143143
{Ip: "127.0.0.1"},
144-
}
144+
},
145145
})
146-
suite.transport2, _ = suite.router.CreateWebRtcTransport(func(o *WebRtcTransportOptions) {
147-
o.ListenIps = []TransportListenIp{
146+
suite.transport2, _ = suite.router.CreateWebRtcTransport(WebRtcTransportOptions{
147+
ListenIps: []TransportListenIp{
148148
{Ip: "127.0.0.1"},
149-
}
149+
},
150150
})
151151

152152
suite.audioProducer = CreateAudioProducer(suite.transport1)

‎dataconsumer_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ func (suite *DataConsumerTestingSuite) SetupTest() {
3434
suite.worker = CreateTestWorker()
3535
suite.router = CreateRouter(suite.worker)
3636
suite.NoError(err)
37-
suite.transport1, err = suite.router.CreateWebRtcTransport(func(o *WebRtcTransportOptions) {
38-
o.ListenIps = []TransportListenIp{
37+
suite.transport1, err = suite.router.CreateWebRtcTransport(WebRtcTransportOptions{
38+
ListenIps: []TransportListenIp{
3939
{Ip: "127.0.0.1"},
40-
}
41-
o.EnableSctp = true
40+
},
41+
EnableSctp: true,
4242
})
4343
suite.NoError(err)
44-
suite.transport2, err = suite.router.CreatePlainTransport(func(o *PlainTransportOptions) {
45-
o.ListenIp = TransportListenIp{
44+
suite.transport2, err = suite.router.CreatePlainTransport(PlainTransportOptions{
45+
ListenIp: TransportListenIp{
4646
Ip: "127.0.0.1",
47-
}
48-
o.EnableSctp = true
47+
},
48+
EnableSctp: true,
4949
})
5050
suite.NoError(err)
5151
suite.transport3, err = suite.router.CreateDirectTransport()

‎dataproducer_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ type DataProducerTestingSuite struct {
2121
func (suite *DataProducerTestingSuite) SetupTest() {
2222
suite.worker = CreateTestWorker()
2323
suite.router = CreateRouter(suite.worker)
24-
suite.transport1, _ = suite.router.CreateWebRtcTransport(func(o *WebRtcTransportOptions) {
25-
o.ListenIps = []TransportListenIp{
24+
suite.transport1, _ = suite.router.CreateWebRtcTransport(WebRtcTransportOptions{
25+
ListenIps: []TransportListenIp{
2626
{Ip: "127.0.0.1"},
27-
}
28-
o.EnableSctp = true
27+
},
28+
EnableSctp: true,
2929
})
30-
suite.transport2, _ = suite.router.CreatePlainTransport(func(o *PlainTransportOptions) {
31-
o.ListenIp = TransportListenIp{
30+
suite.transport2, _ = suite.router.CreatePlainTransport(PlainTransportOptions{
31+
ListenIp: TransportListenIp{
3232
Ip: "127.0.0.1",
33-
}
34-
o.EnableSctp = true
33+
},
34+
EnableSctp: true,
3535
})
3636
}
3737

‎direct_transport.go

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ type DirectTransportOptions struct {
1313
AppData interface{} `json:"appData,omitempty"`
1414
}
1515

16-
type DirectTransportOption func(*DirectTransportOptions)
17-
1816
type directTransportData struct{}
1917

2018
/**

‎direct_transport_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func (suite *DirectTransportTestingSuite) TestRouterCreateDirectTransportSucceed
4242
onObserverNewTransport := NewMockFunc(suite.T())
4343
suite.router.Observer().Once("newtransport", onObserverNewTransport.Fn())
4444

45-
transport1, _ := suite.router.CreateDirectTransport(func(o *DirectTransportOptions) {
46-
o.MaxMessageSize = 1024
47-
o.AppData = H{"foo": "bar"}
45+
transport1, _ := suite.router.CreateDirectTransport(DirectTransportOptions{
46+
MaxMessageSize: 1024,
47+
AppData: H{"foo": "bar"},
4848
})
4949
onObserverNewTransport.ExpectCalledTimes(1)
5050
onObserverNewTransport.ExpectCalledWith(transport1)

‎pipe_transport.go

-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ type PipeTransportOptions struct {
5555
AppData interface{} `json:"appData,omitempty"`
5656
}
5757

58-
type PipeTransportOption func(*PipeTransportOptions)
59-
6058
type pipeTransortData struct {
6159
Tuple TransportTuple `json:"tuple,omitempty"`
6260
SctpParameters SctpParameters `json:"sctpParameters,omitempty"`

‎pipe_transport_test.go

+50-50
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ func (suite *PipeTransportTestingSuite) SetupTest() {
2525
suite.router1 = CreateRouter()
2626
suite.router2 = CreateRouter()
2727

28-
suite.transport1, _ = suite.router1.CreateWebRtcTransport(func(o *WebRtcTransportOptions) {
29-
o.ListenIps = []TransportListenIp{
28+
suite.transport1, _ = suite.router1.CreateWebRtcTransport(WebRtcTransportOptions{
29+
ListenIps: []TransportListenIp{
3030
{Ip: "127.0.0.1"},
31-
}
32-
o.EnableSctp = true
31+
},
32+
EnableSctp: true,
3333
})
34-
suite.transport2, _ = suite.router2.CreateWebRtcTransport(func(o *WebRtcTransportOptions) {
35-
o.ListenIps = []TransportListenIp{
34+
suite.transport2, _ = suite.router2.CreateWebRtcTransport(WebRtcTransportOptions{
35+
ListenIps: []TransportListenIp{
3636
{Ip: "127.0.0.1"},
37-
}
38-
o.EnableSctp = true
37+
},
38+
EnableSctp: true,
3939
})
4040
suite.audioProducer = CreateAudioProducer(suite.transport1)
4141
suite.videoProducer = CreateVP8Producer(suite.transport1)
@@ -59,9 +59,9 @@ func (suite *PipeTransportTestingSuite) TearDownTest() {
5959
}
6060

6161
func (suite *PipeTransportTestingSuite) TestRouterPipeToRouter_SucceedsWithAudio() {
62-
result, err := suite.router1.PipeToRouter(func(o *PipeToRouterOptions) {
63-
o.ProducerId = suite.audioProducer.Id()
64-
o.Router = suite.router2
62+
result, err := suite.router1.PipeToRouter(PipeToRouterOptions{
63+
ProducerId: suite.audioProducer.Id(),
64+
Router: suite.router2,
6565
})
6666
suite.NoError(err)
6767

@@ -137,9 +137,9 @@ func (suite *PipeTransportTestingSuite) TestRouterPipeToRouter_SucceedsWithAudio
137137
}
138138

139139
func (suite *PipeTransportTestingSuite) TestRouterPipeToRouter_SucceedsWithVideo() {
140-
result, err := suite.router1.PipeToRouter(func(o *PipeToRouterOptions) {
141-
o.ProducerId = suite.videoProducer.Id()
142-
o.Router = suite.router2
140+
result, err := suite.router1.PipeToRouter(PipeToRouterOptions{
141+
ProducerId: suite.videoProducer.Id(),
142+
Router: suite.router2,
143143
})
144144
suite.NoError(err)
145145

@@ -247,9 +247,9 @@ func (suite *PipeTransportTestingSuite) TestRouterPipeToRouter_SucceedsWithVideo
247247
}
248248

249249
func (suite *PipeTransportTestingSuite) TestRouterCreatePipeTransport_WithEnableRtxSucceeds() {
250-
pipeTransport, err := suite.router1.CreatePipeTransport(func(o *PipeTransportOptions) {
251-
o.ListenIp = TransportListenIp{Ip: "127.0.0.1"}
252-
o.EnableRtx = true
250+
pipeTransport, err := suite.router1.CreatePipeTransport(PipeTransportOptions{
251+
ListenIp: TransportListenIp{Ip: "127.0.0.1"},
252+
EnableRtx: true,
253253
})
254254
suite.NoError(err)
255255
suite.Empty(pipeTransport.SrtpParameters())
@@ -329,9 +329,9 @@ func (suite *PipeTransportTestingSuite) TestRouterCreatePipeTransport_WithEnable
329329
}
330330

331331
func (suite *PipeTransportTestingSuite) TestRouterCreatePipeTransport_WithEnableSrtpSucceeds() {
332-
pipeTransport, err := suite.router1.CreatePipeTransport(func(o *PipeTransportOptions) {
333-
o.ListenIp = TransportListenIp{Ip: "127.0.0.1"}
334-
o.EnableSrtp = true
332+
pipeTransport, err := suite.router1.CreatePipeTransport(PipeTransportOptions{
333+
ListenIp: TransportListenIp{Ip: "127.0.0.1"},
334+
EnableSrtp: true,
335335
})
336336
suite.NoError(err)
337337
suite.Len(pipeTransport.SrtpParameters().KeyBase64, 40)
@@ -389,9 +389,9 @@ func (suite *PipeTransportTestingSuite) TestRouterCreatePipeTransport_WithEnable
389389
}
390390

391391
func (suite *PipeTransportTestingSuite) TestTransportConsume_ForAPipeProducerSucceeds() {
392-
_, err := suite.router1.PipeToRouter(func(o *PipeToRouterOptions) {
393-
o.ProducerId = suite.videoProducer.Id()
394-
o.Router = suite.router2
392+
_, err := suite.router1.PipeToRouter(PipeToRouterOptions{
393+
ProducerId: suite.videoProducer.Id(),
394+
Router: suite.router2,
395395
})
396396
suite.NoError(err)
397397
videoConsumer, err := suite.transport2.Consume(ConsumerOptions{
@@ -454,9 +454,9 @@ func (suite *PipeTransportTestingSuite) TestTransportConsume_ForAPipeProducerSuc
454454
}
455455

456456
func (suite *PipeTransportTestingSuite) TestProducerPauseAndProducerResumeAreTransmittedToPipeConsumer() {
457-
_, err := suite.router1.PipeToRouter(func(o *PipeToRouterOptions) {
458-
o.ProducerId = suite.videoProducer.Id()
459-
o.Router = suite.router2
457+
_, err := suite.router1.PipeToRouter(PipeToRouterOptions{
458+
ProducerId: suite.videoProducer.Id(),
459+
Router: suite.router2,
460460
})
461461
suite.NoError(err)
462462
videoConsumer, err := suite.transport2.Consume(ConsumerOptions{
@@ -488,9 +488,9 @@ func (suite *PipeTransportTestingSuite) TestProducerPauseAndProducerResumeAreTra
488488
}
489489

490490
func (suite *PipeTransportTestingSuite) TestProducerCloseIsTransmittedToPipeConsumer() {
491-
_, err := suite.router1.PipeToRouter(func(o *PipeToRouterOptions) {
492-
o.ProducerId = suite.videoProducer.Id()
493-
o.Router = suite.router2
491+
_, err := suite.router1.PipeToRouter(PipeToRouterOptions{
492+
ProducerId: suite.videoProducer.Id(),
493+
Router: suite.router2,
494494
})
495495
suite.NoError(err)
496496
videoConsumer, err := suite.transport2.Consume(ConsumerOptions{
@@ -510,9 +510,9 @@ func (suite *PipeTransportTestingSuite) TestProducerCloseIsTransmittedToPipeCons
510510
}
511511

512512
func (suite *PipeTransportTestingSuite) TestProducerPipeRouterSucceedsWithData() {
513-
result, err := suite.router1.PipeToRouter(func(o *PipeToRouterOptions) {
514-
o.DataProducerId = suite.dataProducer.Id()
515-
o.Router = suite.router2
513+
result, err := suite.router1.PipeToRouter(PipeToRouterOptions{
514+
DataProducerId: suite.dataProducer.Id(),
515+
Router: suite.router2,
516516
})
517517
suite.NoError(err)
518518

@@ -553,9 +553,9 @@ func (suite *PipeTransportTestingSuite) TestProducerPipeRouterSucceedsWithData()
553553
}
554554

555555
func (suite *PipeTransportTestingSuite) TestTransportDataConsumeForAPipeDataProducerSucceeds() {
556-
_, err := suite.router1.PipeToRouter(func(o *PipeToRouterOptions) {
557-
o.DataProducerId = suite.dataProducer.Id()
558-
o.Router = suite.router2
556+
_, err := suite.router1.PipeToRouter(PipeToRouterOptions{
557+
DataProducerId: suite.dataProducer.Id(),
558+
Router: suite.router2,
559559
})
560560
suite.NoError(err)
561561
dataConsumer, err := suite.transport2.ConsumeData(DataConsumerOptions{
@@ -574,9 +574,9 @@ func (suite *PipeTransportTestingSuite) TestTransportDataConsumeForAPipeDataProd
574574
}
575575

576576
func (suite *PipeTransportTestingSuite) TestDataProducerCloseIsTransmittedToPipeDataConsumer() {
577-
_, err := suite.router1.PipeToRouter(func(o *PipeToRouterOptions) {
578-
o.DataProducerId = suite.dataProducer.Id()
579-
o.Router = suite.router2
577+
_, err := suite.router1.PipeToRouter(PipeToRouterOptions{
578+
DataProducerId: suite.dataProducer.Id(),
579+
Router: suite.router2,
580580
})
581581
suite.NoError(err)
582582
dataConsumer, err := suite.transport2.ConsumeData(DataConsumerOptions{
@@ -601,27 +601,27 @@ func (suite *PipeTransportTestingSuite) TestRouterPipeRouterCalledTwiceGenenrate
601601
defer routerA.Close()
602602
defer routerB.Close()
603603

604-
transportA1, _ := routerA.CreateWebRtcTransport(func(o *WebRtcTransportOptions) {
605-
o.ListenIps = []TransportListenIp{
604+
transportA1, _ := routerA.CreateWebRtcTransport(WebRtcTransportOptions{
605+
ListenIps: []TransportListenIp{
606606
{Ip: "127.0.0.1"},
607-
}
607+
},
608608
})
609-
transportA2, _ := routerA.CreateWebRtcTransport(func(o *WebRtcTransportOptions) {
610-
o.ListenIps = []TransportListenIp{
609+
transportA2, _ := routerA.CreateWebRtcTransport(WebRtcTransportOptions{
610+
ListenIps: []TransportListenIp{
611611
{Ip: "127.0.0.1"},
612-
}
612+
},
613613
})
614614
audioProducer1 := CreateAudioProducer(transportA1)
615615
audioProducer2 := CreateAudioProducer(transportA2)
616616

617-
_, err := routerA.PipeToRouter(func(o *PipeToRouterOptions) {
618-
o.ProducerId = audioProducer1.Id()
619-
o.Router = routerB
617+
_, err := routerA.PipeToRouter(PipeToRouterOptions{
618+
ProducerId: audioProducer1.Id(),
619+
Router: routerB,
620620
})
621621
suite.NoError(err)
622-
_, err = routerA.PipeToRouter(func(o *PipeToRouterOptions) {
623-
o.ProducerId = audioProducer2.Id()
624-
o.Router = routerB
622+
_, err = routerA.PipeToRouter(PipeToRouterOptions{
623+
ProducerId: audioProducer2.Id(),
624+
Router: routerB,
625625
})
626626
suite.NoError(err)
627627

‎plain_transport.go

-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ type PlainTransportOptions struct {
6161
AppData interface{} `json:"appData,omitempty"`
6262
}
6363

64-
type PlainTransportOption func(*PlainTransportOptions)
65-
6664
type PlainTransportSpecificStat struct {
6765
RtcpMux bool `json:"rtcp_mux"`
6866
Comedia bool `json:"comedia"`

0 commit comments

Comments
 (0)