Skip to content
Snippets Groups Projects
Commit 7ac8dffd authored by Jake Taylor's avatar Jake Taylor
Browse files

cleanup

parent 610ed2a9
No related branches found
No related tags found
2 merge requests!117Release,!102first pass
...@@ -113,14 +113,14 @@ func (c *Client) getRoundResults(roundList []id.Round, timeout time.Duration, ...@@ -113,14 +113,14 @@ func (c *Client) getRoundResults(roundList []id.Round, timeout time.Duration,
numResults++ numResults++
} }
} else { } else {
// Update oldest round (buffer may have updated externally) // Update the oldest round (buffer may have updated externally)
if rnd < oldestRound { if rnd < oldestRound {
// If round is older that oldest round in our buffer // If round is older that oldest round in our buffer
// Add it to the historical round request (performed later) // Add it to the historical round request (performed later)
historicalRequest.Rounds = append(historicalRequest.Rounds, uint64(rnd)) historicalRequest.Rounds = append(historicalRequest.Rounds, uint64(rnd))
numResults++ numResults++
} else { } else {
// Otherwise, monitor it's progress // Otherwise, monitor its progress
roundEvents.AddRoundEventChan(rnd, sendResults, roundEvents.AddRoundEventChan(rnd, sendResults,
timeout-time.Millisecond, states.COMPLETED, states.FAILED) timeout-time.Millisecond, states.COMPLETED, states.FAILED)
numResults++ numResults++
...@@ -162,6 +162,7 @@ func (c *Client) getRoundResults(roundList []id.Round, timeout time.Duration, ...@@ -162,6 +162,7 @@ func (c *Client) getRoundResults(roundList []id.Round, timeout time.Duration,
Rounds: []uint64{roundReport.RoundInfo.ID}, Rounds: []uint64{roundReport.RoundInfo.ID},
} }
// Request that round's information, feeding back into sendResults // Request that round's information, feeding back into sendResults
jww.DEBUG.Printf("Sending HistoricalRounds retry for Round %d", roundReport.RoundInfo.ID)
go c.getHistoricalRounds(timeoutRequest, sendResults, commsInterface) go c.getHistoricalRounds(timeoutRequest, sendResults, commsInterface)
} else { } else {
// If available, denote the result // If available, denote the result
...@@ -182,7 +183,7 @@ func (c *Client) getRoundResults(roundList []id.Round, timeout time.Duration, ...@@ -182,7 +183,7 @@ func (c *Client) getRoundResults(roundList []id.Round, timeout time.Duration,
} }
// Helper function which asynchronously pings a random gateway until // Helper function which asynchronously pings a random gateway until
// it gets information on it's requested historical rounds // it gets information on its requested historical rounds
func (c *Client) getHistoricalRounds(msg *pb.HistoricalRounds, func (c *Client) getHistoricalRounds(msg *pb.HistoricalRounds,
sendResults chan ds.EventReturn, comms historicalRoundsComm) { sendResults chan ds.EventReturn, comms historicalRoundsComm) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment