handler fixes for tests
Juan Batiz-Benet committed
Oct 10, 2014 at 20:48 UTC
26c4e5004cdbce2d15b2c010c34455528f28c1b0
3 files changed
+17
-11
net/service/service.go
+6
@@ -49,6 +49,7 @@ type Service interface {
49
50
// SetHandler assigns the request Handler for this service.
51
SetHandler(Handler)
52
+ GetHandler() Handler
53
}
54
55
// Service is a networking component that protocols can use to multiplex
@@ -246,3 +247,8 @@ func (s *service) handleIncomingMessage(ctx context.Context, m msg.NetMessage) {
247
func (s *service) SetHandler(h Handler) {
248
s.Handler = h
249
}
250
+
251
+// GetHandler returns the request Handler for this service.
252
+func (s *service) GetHandler() Handler {
253
+ return s.Handler
254
+}
net/service/service_test.go
+10
-10
@@ -51,8 +51,8 @@ func TestServiceHandler(t *testing.T) {
51
}
52
53
m1 := msg.New(peer1, d)
54
- s.Incoming <- m1
55
- m2 := <-s.Outgoing
54
+ s.GetPipe().Incoming <- m1
55
+ m2 := <-s.GetPipe().Outgoing
56
57
d, rid, err := unwrapData(m2.Data())
58
if err != nil {
@@ -87,10 +87,10 @@ func TestServiceRequest(t *testing.T) {
87
go func() {
88
for {
89
select {
90
- case m := <-s1.Outgoing:
91
- s2.Incoming <- m
92
- case m := <-s2.Outgoing:
93
- s1.Incoming <- m
90
+ case m := <-s1.GetPipe().Outgoing:
91
+ s2.GetPipe().Incoming <- m
92
+ case m := <-s2.GetPipe().Outgoing:
93
+ s1.GetPipe().Incoming <- m
94
case <-ctx.Done():
95
return
96
}
@@ -127,10 +127,10 @@ func TestServiceRequestTimeout(t *testing.T) {
127
for {
128
<-time.After(time.Millisecond)
129
select {
130
- case m := <-s1.Outgoing:
131
- s2.Incoming <- m
132
- case m := <-s2.Outgoing:
133
- s1.Incoming <- m
130
+ case m := <-s1.GetPipe().Outgoing:
131
+ s2.GetPipe().Incoming <- m
132
+ case m := <-s2.GetPipe().Outgoing:
133
+ s1.GetPipe().Incoming <- m
134
case <-ctx.Done():
135
return
136
}
routing/dht/dht_test.go
+1
-1
@@ -39,7 +39,7 @@ func setupDHT(t *testing.T, p *peer.Peer) *IpfsDHT {
39
}
40
41
d := NewDHT(p, peerstore, net, dhts, ds.NewMapDatastore())
42
- dhts.Handler = d
42
+ dhts.SetHandler(d)
43
return d
44
}
45