opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-28 00:39:31 +08:00
Code Issues Projects Releases Wiki Activity

handler fixes for tests

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-10-10 20:48:20 -07:00
parent 726f53ff41
commit 26c4e5004c
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/service/service.go
View File

@ -49,6 +49,7 @@ type Service interface {
// SetHandler assigns the request Handler for this service. // SetHandler assigns the request Handler for this service.
SetHandler(Handler) SetHandler(Handler)
GetHandler() Handler
} }
// Service is a networking component that protocols can use to multiplex // 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) {
func (s *service) SetHandler(h Handler) { func (s *service) SetHandler(h Handler) {
s.Handler = h s.Handler = h
} }
// GetHandler returns the request Handler for this service.
func (s *service) GetHandler() Handler {
return s.Handler
}

20
net/service/service_test.go
View File

@ -51,8 +51,8 @@ func TestServiceHandler(t *testing.T) {
} }
m1 := msg.New(peer1, d) m1 := msg.New(peer1, d)
s.Incoming <- m1 s.GetPipe().Incoming <- m1
m2 := <-s.Outgoing m2 := <-s.GetPipe().Outgoing
d, rid, err := unwrapData(m2.Data()) d, rid, err := unwrapData(m2.Data())
if err != nil { if err != nil {
@ -87,10 +87,10 @@ func TestServiceRequest(t *testing.T) {
go func() { go func() {
for { for {
select { select {
case m := <-s1.Outgoing: case m := <-s1.GetPipe().Outgoing:
s2.Incoming <- m s2.GetPipe().Incoming <- m
case m := <-s2.Outgoing: case m := <-s2.GetPipe().Outgoing:
s1.Incoming <- m s1.GetPipe().Incoming <- m
case <-ctx.Done(): case <-ctx.Done():
return return
} }
@ -127,10 +127,10 @@ func TestServiceRequestTimeout(t *testing.T) {
for { for {
<-time.After(time.Millisecond) <-time.After(time.Millisecond)
select { select {
case m := <-s1.Outgoing: case m := <-s1.GetPipe().Outgoing:
s2.Incoming <- m s2.GetPipe().Incoming <- m
case m := <-s2.Outgoing: case m := <-s2.GetPipe().Outgoing:
s1.Incoming <- m s1.GetPipe().Incoming <- m
case <-ctx.Done(): case <-ctx.Done():
return return
} }

2
routing/dht/dht_test.go
View File

@ -39,7 +39,7 @@ func setupDHT(t *testing.T, p *peer.Peer) *IpfsDHT {
} }
d := NewDHT(p, peerstore, net, dhts, ds.NewMapDatastore()) d := NewDHT(p, peerstore, net, dhts, ds.NewMapDatastore())
dhts.Handler = d dhts.SetHandler(d)
return d return d
} }