Merge pull request #255 from blinklabs-io/fix/chainsync-getcurrenttip-hang

agaffney · web-flow · commit 89dd6d77206b · 2023-05-11T20:51:04.000-05:00
fix: clear out intersect result channel when getting tip to prevent hangs
diff --git a/protocol/chainsync/client.go b/protocol/chainsync/client.go
@@ -121,6 +121,8 @@ func (c *Client) GetCurrentTip() (*Tip, error) {
 		return nil, err
 	}
 	tip := <-c.currentTipChan
+	// Clear out intersect result channel to prevent blocking
+	<-c.intersectResultChan
 	c.wantCurrentTip = false
 	return &tip, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,8 @@ func (c Client) GetCurrentTip() (Tip, error) {`
`121`	`121`	`return nil, err`
`122`	`122`	`}`
`123`	`123`	`tip := <-c.currentTipChan`
	`124`	`+ // Clear out intersect result channel to prevent blocking`
	`125`	`+ <-c.intersectResultChan`
`124`	`126`	`c.wantCurrentTip = false`
`125`	`127`	`return &tip, nil`
`126`	`128`	`}`