@@ -129,7 +129,6 @@ func (bl *blockListener) newHeadsSubListener() {
129129func (bl * blockListener ) establishBlockHeightWithRetry () error {
130130 wsConnected := false
131131 return bl .c .retry .Do (bl .ctx , "get initial block height" , func (_ int ) (retry bool , err error ) {
132-
133132 // If we have a WebSocket backend, then we connect it and switch over to using it
134133 // (we accept an un-locked update here to backend, as the most important routine that's
135134 // querying block state is the one we're called on)
@@ -197,11 +196,11 @@ func (bl *blockListener) listenLoop() {
197196 // Sleep for the polling interval, or until we're shoulder tapped by the newHeads listener
198197 if ! firstIteration {
199198 select {
200- case <- time .After (bl .blockPollingInterval ):
201- case <- bl .newHeadsTap :
202199 case <- bl .ctx .Done ():
203200 log .L (bl .ctx ).Debugf ("Block listener loop stopping" )
204201 return
202+ case <- time .After (bl .blockPollingInterval ):
203+ case <- bl .newHeadsTap :
205204 }
206205 } else {
207206 firstIteration = false
@@ -296,7 +295,6 @@ func (bl *blockListener) listenLoop() {
296295// head of the canonical chain we have. If these blocks do not just fit onto the end of the chain, then we
297296// work backwards building a new view and notify about all blocks that are changed in that process.
298297func (bl * blockListener ) reconcileCanonicalChain (bi * blockInfoJSONRPC ) * list.Element {
299-
300298 mbi := & minimalBlockInfo {
301299 number : bi .Number .BigInt ().Int64 (),
302300 hash : bi .Hash .String (),
@@ -336,7 +334,6 @@ func (bl *blockListener) reconcileCanonicalChain(bi *blockInfoJSONRPC) *list.Ele
336334// handleNewBlock rebuilds the canonical chain around a new block, checking if we need to rebuild our
337335// view of the canonical chain behind it, or trimming anything after it that is invalidated by a new fork.
338336func (bl * blockListener ) handleNewBlock (mbi * minimalBlockInfo , addAfter * list.Element ) * list.Element {
339-
340337 // If we have an existing canonical chain before this point, then we need to check we've not
341338 // invalidated that with this block. If we have, then we have to re-verify our whole canonical
342339 // chain from the first block. Then notify from the earliest point where it has diverged.
@@ -374,7 +371,6 @@ func (bl *blockListener) handleNewBlock(mbi *minimalBlockInfo, addAfter *list.El
374371 log .L (bl .ctx ).Debugf ("Added block %d / %s parent=%s to in-memory canonical chain (new length=%d)" , mbi .number , mbi .hash , mbi .parentHash , bl .canonicalChain .Len ())
375372
376373 return newElem
377-
378374}
379375
380376// rebuildCanonicalChain is called (only on non-empty case) when our current chain does not seem to line up with
0 commit comments