certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spy: Fixed obsvReqC hanging issue

This commit is contained in:
Christine Eun 2022-09-15 19:48:57 +00:00 committed by Evan Gray
parent d69ad85994
commit aae1ea1c3f
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
node/cmd/spy/spy.go
View File

@ -250,6 +250,9 @@ func runSpy(cmd *cobra.Command, args []string) {
// Inbound observations
obsvC := make(chan *gossipv1.SignedObservation, 50)
// Inbound observation requests
obsvReqC := make(chan *gossipv1.ObservationRequest, 50)
// Inbound signed VAAs
signedInC := make(chan *gossipv1.SignedVAAWithQuorum, 50)
@ -274,6 +277,18 @@ func runSpy(cmd *cobra.Command, args []string) {
}
}()
// Ignore observation requests
// Note: without this, the whole program hangs on observation requests
go func() {
for {
select {
case <-rootCtx.Done():
return
case <-obsvReqC:
}
}
}()
// Log signed VAAs
go func() {
for {
@ -299,7 +314,7 @@ func runSpy(cmd *cobra.Command, args []string) {
// Run supervisor.
supervisor.New(rootCtx, logger, func(ctx context.Context) error {
if err := supervisor.Run(ctx, "p2p", p2p.Run(obsvC, nil, nil, sendC, signedInC, priv, nil, gst, *p2pPort, *p2pNetworkID, *p2pBootstrap, "", false, rootCtxCancel, nil)); err != nil {
if err := supervisor.Run(ctx, "p2p", p2p.Run(obsvC, obsvReqC, nil, sendC, signedInC, priv, nil, gst, *p2pPort, *p2pNetworkID, *p2pBootstrap, "", false, rootCtxCancel, nil)); err != nil {
return err
}