Commit fd2b8faf authored by Jeromy's avatar Jeromy

some cleanup, and fix minor bug in dagreader from previous commit

parent f62fd5b2
...@@ -61,12 +61,8 @@ func NewDagReader(n *mdag.Node, serv mdag.DAGService) (io.Reader, error) { ...@@ -61,12 +61,8 @@ func NewDagReader(n *mdag.Node, serv mdag.DAGService) (io.Reader, error) {
func (dr *DagReader) precalcNextBuf() error { func (dr *DagReader) precalcNextBuf() error {
var nxt *mdag.Node var nxt *mdag.Node
var ok bool var ok bool
select {
case nxt, ok = <-dr.fetchChan: if dr.serv == nil {
if !ok {
return io.EOF
}
default:
// Only used when fetchChan is nil, // Only used when fetchChan is nil,
// which only happens when passed in a nil dagservice // which only happens when passed in a nil dagservice
// TODO: this logic is hard to follow, do it better. // TODO: this logic is hard to follow, do it better.
...@@ -76,7 +72,18 @@ func (dr *DagReader) precalcNextBuf() error { ...@@ -76,7 +72,18 @@ func (dr *DagReader) precalcNextBuf() error {
return io.EOF return io.EOF
} }
nxt = dr.node.Links[dr.linkPosition].Node nxt = dr.node.Links[dr.linkPosition].Node
if nxt == nil {
return errors.New("Got nil node back from link! and no DAGService!")
}
dr.linkPosition++ dr.linkPosition++
} else {
select {
case nxt, ok = <-dr.fetchChan:
if !ok {
return io.EOF
}
}
} }
pb := new(ftpb.Data) pb := new(ftpb.Data)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment