Skip to content

Commit e8df373

Browse files
committed
Merge remote-tracking branch 'origin/release/0.6.0' into feat/receiver
2 parents e60a8a7 + abd8b8e commit e8df373

File tree

1 file changed

+91
-22
lines changed

1 file changed

+91
-22
lines changed

aw_test.go

+91-22
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ var _ = Describe("Peer", func() {
6868
peer1 := peers[0]
6969
peer2 := peers[1]
7070

71-
peer1.GossipNonBlocking(contentID, nil)
71+
err = peer1.GossipNonBlocking(contentID, nil)
72+
if err != nil {
73+
panic(err)
74+
}
7275

7376
Eventually(func() []byte { msg, _ := peer2.ContentResolver.QueryContent(contentID); return msg }).Should(Equal(content))
7477
})
@@ -91,7 +94,10 @@ var _ = Describe("Peer", func() {
9194
data := []byte("hello")
9295
peer1.ContentResolver.InsertContent(contentID, data)
9396

94-
peer1.GossipNonBlocking(contentID, nil)
97+
err = peer1.GossipNonBlocking(contentID, nil)
98+
if err != nil {
99+
panic(err)
100+
}
95101

96102
Eventually(func() []byte { msg, _ := peer2.ContentResolver.QueryContent(contentID); return msg }).Should(Equal(data))
97103
})
@@ -122,7 +128,10 @@ var _ = Describe("Peer", func() {
122128
contentID := []byte("id")
123129
data := []byte("hello")
124130
peers[0].ContentResolver.InsertContent(contentID, data)
125-
peers[0].GossipNonBlocking(contentID, nil)
131+
err = peers[0].GossipNonBlocking(contentID, nil)
132+
if err != nil {
133+
panic(err)
134+
}
126135

127136
for _, peer := range peers {
128137
Eventually(func() []byte { msg, _ := peer.ContentResolver.QueryContent(contentID); return msg }).Should(Equal(data))
@@ -155,7 +164,10 @@ var _ = Describe("Peer", func() {
155164
}
156165
go peer1.Run(ctx)
157166

158-
peer1.GossipNonBlocking(contentID, nil)
167+
err = peer1.GossipNonBlocking(contentID, nil)
168+
if err != nil {
169+
panic(err)
170+
}
159171

160172
time.Sleep(50 * time.Millisecond)
161173

@@ -203,7 +215,10 @@ var _ = Describe("Peer", func() {
203215
contentID := []byte("id")
204216
data := []byte("hello")
205217
peers[0].ContentResolver.InsertContent(contentID, data)
206-
peers[0].GossipNonBlocking(contentID, &subnet)
218+
err = peers[0].GossipNonBlocking(contentID, &subnet)
219+
if err != nil {
220+
panic(err)
221+
}
207222

208223
// Give more of an opportunity for the gossip to reach everyone.
209224
time.Sleep(50 * time.Millisecond)
@@ -386,8 +401,14 @@ var _ = Describe("Peer", func() {
386401
go peer1.Run(ctx)
387402
go peer2.Run(ctx)
388403

389-
peer1.Link(peer2.ID())
390-
peer2.Link(peer1.ID())
404+
err = peer1.Link(peer2.ID())
405+
if err != nil {
406+
panic(err)
407+
}
408+
err = peer2.Link(peer1.ID())
409+
if err != nil {
410+
panic(err)
411+
}
391412

392413
msg := []byte("hello")
393414
sendCtx, sendCancel := context.WithTimeout(ctx, time.Second)
@@ -440,24 +461,39 @@ var _ = Describe("Peer", func() {
440461
go stablePeer.Run(ctx)
441462
go crashPeer.Run(ctx)
442463

443-
stablePeer.Link(crashPeer.ID())
444-
crashPeer.Link(stablePeer.ID())
464+
err = stablePeer.Link(crashPeer.ID())
465+
if err != nil {
466+
panic(err)
467+
}
468+
err = crashPeer.Link(stablePeer.ID())
469+
if err != nil {
470+
panic(err)
471+
}
445472

446473
numMessages := 20
447474
for i := 0; i < numMessages; i++ {
448475
contentID := []byte(fmt.Sprintf("%v", i))
449476
content := []byte(fmt.Sprintf("message %v", i))
450477
stablePeer.ContentResolver.InsertContent(contentID, content)
451-
stablePeer.Gossip(ctx, contentID, nil)
478+
err = stablePeer.Gossip(ctx, contentID, nil)
479+
if err != nil {
480+
panic(err)
481+
}
452482

453483
if i == numMessages/2 {
454484
// NOTE(ross): We don't check that the content was received
455485
// because there is always a chance that it won't be; this can
456486
// happen if the connection is killed at any point after the
457487
// stable peer sends the gossip and before the sync is handled
458488
// by the crash peer.
459-
crashPeer.Unlink(stablePeer.ID())
460-
crashPeer.Link(stablePeer.ID())
489+
err = crashPeer.Unlink(stablePeer.ID())
490+
if err != nil {
491+
panic(err)
492+
}
493+
err = crashPeer.Link(stablePeer.ID())
494+
if err != nil {
495+
panic(err)
496+
}
461497

462498
// NOTE(ross): Due to scheduling, it is possible that the next
463499
// loop can begin and the stable peer can have started
@@ -540,14 +576,26 @@ var _ = Describe("Peer", func() {
540576
go writePeer.Run(ctx)
541577
go readPeer.Run(ctx)
542578

543-
writePeer.Link(readPeer.ID())
544-
readPeer.Link(writePeer.ID())
579+
err = writePeer.Link(readPeer.ID())
580+
if err != nil {
581+
panic(err)
582+
}
583+
err = readPeer.Link(writePeer.ID())
584+
if err != nil {
585+
panic(err)
586+
}
545587

546588
data := make([]byte, int(opts.ConnectionRateLimiterOptions.Rate))
547589

548-
writePeer.Send(ctx, data, readPeer.ID())
590+
err = writePeer.Send(ctx, data, readPeer.ID())
591+
if err != nil {
592+
panic(err)
593+
}
549594
Eventually(received).Should(Receive())
550-
writePeer.Send(ctx, data, readPeer.ID())
595+
err = writePeer.Send(ctx, data, readPeer.ID())
596+
if err != nil {
597+
panic(err)
598+
}
551599
Consistently(received).ShouldNot(Receive())
552600
})
553601
})
@@ -603,13 +651,19 @@ var _ = Describe("Peer", func() {
603651
go lastPeer.Run(ctx)
604652

605653
for _, otherPeer := range otherPeers {
606-
otherPeer.Link(peer.ID())
654+
err = otherPeer.Link(peer.ID())
655+
if err != nil {
656+
panic(err)
657+
}
607658
}
608659

609660
// Give some time for the other peers to finish linking.
610661
time.Sleep(50 * time.Millisecond)
611662

612-
lastPeer.Send(ctx, []byte{0}, peer.ID())
663+
err = lastPeer.Send(ctx, []byte{0}, peer.ID())
664+
if err != nil {
665+
panic(err)
666+
}
613667

614668
Consistently(received).ShouldNot(Receive())
615669
})
@@ -721,6 +775,7 @@ var _ = Describe("Peer", func() {
721775
Data: buf[:32],
722776
}
723777
bs, err := surge.ToBinary(msg)
778+
Expect(err).ToNot(HaveOccurred())
724779
nonceBuf = session.GetWriteNonceAndIncrement()
725780
sealed = session.GCM.Seal(buf[4:4], nonceBuf[:], bs, nil)
726781
binary.BigEndian.PutUint32(buf, uint32(len(sealed)))
@@ -749,6 +804,7 @@ var _ = Describe("Peer", func() {
749804
Data: id[:],
750805
}
751806
bs, err = surge.ToBinary(msg)
807+
Expect(err).ToNot(HaveOccurred())
752808
nonceBuf = session.GetWriteNonceAndIncrement()
753809
sealed = session.GCM.Seal(buf[4:4], nonceBuf[:], bs, nil)
754810
binary.BigEndian.PutUint32(buf, uint32(len(sealed)))
@@ -771,6 +827,7 @@ var _ = Describe("Peer", func() {
771827
SyncData: buf[:100],
772828
}
773829
bs, err = surge.ToBinary(msg)
830+
Expect(err).ToNot(HaveOccurred())
774831
nonceBuf = session.GetWriteNonceAndIncrement()
775832
sealed = session.GCM.Seal(buf[4:4], nonceBuf[:], bs, nil)
776833
binary.BigEndian.PutUint32(buf, uint32(len(sealed)))
@@ -865,8 +922,14 @@ func linkAllPeers(peers []*aw.Peer) {
865922
for i := range peers {
866923
for j := range peers {
867924
if i != j {
868-
peers[i].Link(peers[j].ID())
869-
peers[j].Link(peers[i].ID())
925+
err := peers[i].Link(peers[j].ID())
926+
if err != nil {
927+
panic(err)
928+
}
929+
err = peers[j].Link(peers[i].ID())
930+
if err != nil {
931+
panic(err)
932+
}
870933
}
871934
}
872935
}
@@ -877,8 +940,14 @@ func linkPeersRing(peers []*aw.Peer) {
877940

878941
for i := range peers {
879942
next := (i + 1) % n
880-
peers[i].Link(peers[next].ID())
881-
peers[next].Link(peers[i].ID())
943+
err := peers[i].Link(peers[next].ID())
944+
if err != nil {
945+
panic(err)
946+
}
947+
err = peers[next].Link(peers[i].ID())
948+
if err != nil {
949+
panic(err)
950+
}
882951
}
883952
}
884953

0 commit comments

Comments
 (0)