fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-12 21:01:21 +00:00
Code Issues Projects Releases Wiki Activity

fixes from Jae's review

Browse Source 
1. remove pointer
2. add Quit() method to Service interface
This commit is contained in:
Anton Kaliaev
2018-02-12 14:31:52 +04:00
parent f1c8489270
commit 2a24ae90c1
21 changed files with 38 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/lib/client/ws_client.go
View File

@ -335,7 +335,7 @@ func (c *WSClient) reconnectRoutine() {
c.startReadWriteRoutines()
}
}
case <-c.Quit:
case <-c.Quit():
return
}
}
@ -394,7 +394,7 @@ func (c *WSClient) writeRoutine() {
c.Logger.Debug("sent ping")
case <-c.readRoutineQuit:
return
case <-c.Quit:
case <-c.Quit():
if err := c.conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")); err != nil {
c.Logger.Error("failed to write message", "err", err)
}
@ -455,7 +455,7 @@ func (c *WSClient) readRoutine() {
// c.wg.Wait() in c.Stop(). Note we rely on Quit being closed so that it sends unlimited Quit signals to stop
// both readRoutine and writeRoutine
select {
case <-c.Quit:
case <-c.Quit():
case c.ResponsesCh <- response:
}
}

4
rpc/lib/client/ws_client_test.go
View File

@ -132,7 +132,7 @@ func TestWSClientReconnectFailure(t *testing.T) {
for {
select {
case <-c.ResponsesCh:
case <-c.Quit:
case <-c.Quit():
return
}
}
@ -217,7 +217,7 @@ func callWgDoneOnResult(t *testing.T, c *WSClient, wg *sync.WaitGroup) {
if resp.Result != nil {
wg.Done()
}
case <-c.Quit:
case <-c.Quit():
return
}
}