Merge pull request #807 from tendermint/45-change-common-start-signature

service#Start, service#Stop signatures were changed

Makefile

@@ -83,17 +83,17 @@ ensure_tools:
 
 ### Formatting, linting, and vetting
 
-metalinter: 
+metalinter:
 	@gometalinter --vendor --deadline=600s --enable-all --disable=lll ./...
 
-metalinter_test: 
+metalinter_test:
 	@gometalinter --vendor --deadline=600s --disable-all  \
 		--enable=deadcode \
-		--enable=gas \
 	 	--enable=misspell \
 		--enable=safesql \
 		./...
 
+		# --enable=gas \
 		#--enable=maligned \
 		#--enable=dupl \
 		#--enable=errcheck \

benchmarks/simu/counter.go

@@ -12,7 +12,7 @@ import (
 
 func main() {
 	wsc := rpcclient.NewWSClient("127.0.0.1:46657", "/websocket")
-	_, err := wsc.Start()
+	err := wsc.Start()
 	if err != nil {
 		cmn.Exit(err.Error())
 	}

blockchain/pool.go

@@ -311,7 +311,7 @@ func (pool *BlockPool) makeNextRequester() {
 	pool.requesters[nextHeight] = request
 	pool.numPending++
 
-	_, err := request.Start()
+	err := request.Start()
 	if err != nil {
 		request.Logger.Error("Error starting request", "err", err)
 	}

blockchain/pool_test.go

@@ -37,7 +37,7 @@ func TestBasic(t *testing.T) {
 	pool := NewBlockPool(start, requestsCh, timeoutsCh)
 	pool.SetLogger(log.TestingLogger())
 
-	_, err := pool.Start()
+	err := pool.Start()
 	if err != nil {
 		t.Error(err)
 	}
@@ -93,7 +93,7 @@ func TestTimeout(t *testing.T) {
 	requestsCh := make(chan BlockRequest, 100)
 	pool := NewBlockPool(start, requestsCh, timeoutsCh)
 	pool.SetLogger(log.TestingLogger())
-	_, err := pool.Start()
+	err := pool.Start()
 	if err != nil {
 		t.Error(err)
 	}

blockchain/reactor.go

@@ -92,7 +92,7 @@ func (bcR *BlockchainReactor) OnStart() error {
 		return err
 	}
 	if bcR.fastSync {
-		_, err := bcR.pool.Start()
+		err := bcR.pool.Start()
 		if err != nil {
 			return err
 		}

cmd/tendermint/commands/run_node.go

@@ -49,7 +49,7 @@ func NewRunNodeCmd(nodeProvider nm.NodeProvider) *cobra.Command {
 				return fmt.Errorf("Failed to create node: %v", err)
 			}
 
-			if _, err := n.Start(); err != nil {
+			if err := n.Start(); err != nil {
 				return fmt.Errorf("Failed to start node: %v", err)
 			} else {
 				logger.Info("Started node", "nodeInfo", n.Switch().NodeInfo())

consensus/byzantine_test.go

@@ -58,7 +58,7 @@ func TestByzantine(t *testing.T) {
 
 		eventBus := types.NewEventBus()
 		eventBus.SetLogger(logger.With("module", "events", "validator", i))
-		_, err := eventBus.Start()
+		err := eventBus.Start()
 		require.NoError(t, err)
 		defer eventBus.Stop()
 

consensus/common_test.go

@@ -464,12 +464,12 @@ type mockTicker struct {
 	fired    bool
 }
 
-func (m *mockTicker) Start() (bool, error) {
+func (m *mockTicker) Start() error {
-	return true, nil
+	return nil
 }
 
-func (m *mockTicker) Stop() bool {
+func (m *mockTicker) Stop() error {
-	return true
+	return nil
 }
 
 func (m *mockTicker) ScheduleTimeout(ti timeoutInfo) {

consensus/reactor.go

@@ -65,7 +65,7 @@ func (conR *ConsensusReactor) OnStart() error {
 	}
 
 	if !conR.FastSync() {
-		_, err := conR.conS.Start()
+		err := conR.conS.Start()
 		if err != nil {
 			return err
 		}
@@ -97,7 +97,7 @@ func (conR *ConsensusReactor) SwitchToConsensus(state *sm.State, blocksSynced in
 		// dont bother with the WAL if we fast synced
 		conR.conS.doWALCatchup = false
 	}
-	_, err := conR.conS.Start()
+	err := conR.conS.Start()
 	if err != nil {
 		conR.Logger.Error("Error starting conS", "err", err)
 	}

consensus/reactor_test.go

@@ -41,7 +41,7 @@ func startConsensusNet(t *testing.T, css []*ConsensusState, N int) ([]*Consensus
 
 		eventBuses[i] = types.NewEventBus()
 		eventBuses[i].SetLogger(thisLogger.With("module", "events", "validator", i))
-		_, err := eventBuses[i].Start()
+		err := eventBuses[i].Start()
 		require.NoError(t, err)
 
 		reactors[i].SetEventBus(eventBuses[i])

consensus/replay.go

@@ -356,7 +356,6 @@ func (h *Handshaker) replayBlock(height int, proxyApp proxy.AppConnConsensus) ([
 func (h *Handshaker) checkAppHash(appHash []byte) error {
 	if !bytes.Equal(h.state.AppHash, appHash) {
 		panic(errors.New(cmn.Fmt("Tendermint state.AppHash does not match AppHash after replay. Got %X, expected %X", appHash, h.state.AppHash)).Error())
-		return nil
 	}
 	return nil
 }
@@ -371,7 +370,7 @@ func newMockProxyApp(appHash []byte, abciResponses *sm.ABCIResponses) proxy.AppC
 		abciResponses: abciResponses,
 	})
 	cli, _ := clientCreator.NewABCIClient()
-	_, err := cli.Start()
+	err := cli.Start()
 	if err != nil {
 		panic(err)
 	}

consensus/replay_file.go

@@ -292,13 +292,13 @@ func newConsensusStateForReplay(config cfg.BaseConfig, csConfig *cfg.ConsensusCo
 	// Create proxyAppConn connection (consensus, mempool, query)
 	clientCreator := proxy.DefaultClientCreator(config.ProxyApp, config.ABCI, config.DBDir())
 	proxyApp := proxy.NewAppConns(clientCreator, NewHandshaker(state, blockStore))
-	_, err = proxyApp.Start()
+	err = proxyApp.Start()
 	if err != nil {
 		cmn.Exit(cmn.Fmt("Error starting proxy app conns: %v", err))
 	}
 
 	eventBus := types.NewEventBus()
-	if _, err := eventBus.Start(); err != nil {
+	if err := eventBus.Start(); err != nil {
 		cmn.Exit(cmn.Fmt("Failed to start event bus: %v", err))
 	}
 

consensus/replay_test.go

@@ -70,7 +70,7 @@ func startNewConsensusStateAndWaitForBlock(t *testing.T, lastBlockHeight int, bl
 	// fmt.Printf("====== WAL: \n\r%s\n", bytes)
 	t.Logf("====== WAL: \n\r%s\n", bytes)
 
-	_, err := cs.Start()
+	err := cs.Start()
 	require.NoError(t, err)
 	defer func() {
 		cs.Stop()
@@ -171,7 +171,7 @@ LOOP:
 		cs.wal = crashingWal
 
 		// start consensus state
-		_, err = cs.Start()
+		err = cs.Start()
 		require.NoError(t, err)
 
 		i++
@@ -257,9 +257,9 @@ func (w *crashingWAL) SearchForEndHeight(height uint64) (gr *auto.GroupReader, f
 	return w.next.SearchForEndHeight(height)
 }
 
-func (w *crashingWAL) Start() (bool, error) { return w.next.Start() }
+func (w *crashingWAL) Start() error { return w.next.Start() }
-func (w *crashingWAL) Stop() bool           { return w.next.Stop() }
+func (w *crashingWAL) Stop() error  { return w.next.Stop() }
-func (w *crashingWAL) Wait()                { w.next.Wait() }
+func (w *crashingWAL) Wait()        { w.next.Wait() }
 
 //------------------------------------------------------------------------------------------
 // Handshake Tests
@@ -339,7 +339,7 @@ func testHandshakeReplay(t *testing.T, nBlocks int, mode uint) {
 		t.Fatal(err)
 	}
 	wal.SetLogger(log.TestingLogger())
-	if _, err := wal.Start(); err != nil {
+	if err := wal.Start(); err != nil {
 		t.Fatal(err)
 	}
 	chain, commits, err := makeBlockchainFromWAL(wal)
@@ -368,7 +368,7 @@ func testHandshakeReplay(t *testing.T, nBlocks int, mode uint) {
 	// now start the app using the handshake - it should sync
 	handshaker := NewHandshaker(state, store)
 	proxyApp := proxy.NewAppConns(clientCreator2, handshaker)
-	if _, err := proxyApp.Start(); err != nil {
+	if err := proxyApp.Start(); err != nil {
 		t.Fatalf("Error starting proxy app connections: %v", err)
 	}
 
@@ -406,7 +406,7 @@ func applyBlock(st *sm.State, blk *types.Block, proxyApp proxy.AppConns) {
 func buildAppStateFromChain(proxyApp proxy.AppConns,
 	state *sm.State, chain []*types.Block, nBlocks int, mode uint) {
 	// start a new app without handshake, play nBlocks blocks
-	if _, err := proxyApp.Start(); err != nil {
+	if err := proxyApp.Start(); err != nil {
 		panic(err)
 	}
 
@@ -441,7 +441,7 @@ func buildTMStateFromChain(config *cfg.Config, state *sm.State, chain []*types.B
 	// run the whole chain against this client to build up the tendermint state
 	clientCreator := proxy.NewLocalClientCreator(dummy.NewPersistentDummyApplication(path.Join(config.DBDir(), "1")))
 	proxyApp := proxy.NewAppConns(clientCreator, nil) // sm.NewHandshaker(config, state, store, ReplayLastBlock))
-	if _, err := proxyApp.Start(); err != nil {
+	if err := proxyApp.Start(); err != nil {
 		panic(err)
 	}
 	defer proxyApp.Stop()

consensus/state.go

@@ -229,7 +229,7 @@ func (cs *ConsensusState) OnStart() error {
 	// NOTE: we will get a build up of garbage go routines
 	// firing on the tockChan until the receiveRoutine is started
 	// to deal with them (by that point, at most one will be valid)
-	_, err := cs.timeoutTicker.Start()
+	err := cs.timeoutTicker.Start()
 	if err != nil {
 		return err
 	}
@@ -257,7 +257,7 @@ func (cs *ConsensusState) OnStart() error {
 // timeoutRoutine: receive requests for timeouts on tickChan and fire timeouts on tockChan
 // receiveRoutine: serializes processing of proposoals, block parts, votes; coordinates state transitions
 func (cs *ConsensusState) startRoutines(maxSteps int) {
-	_, err := cs.timeoutTicker.Start()
+	err := cs.timeoutTicker.Start()
 	if err != nil {
 		cs.Logger.Error("Error starting timeout ticker", "err", err)
 		return
@@ -292,7 +292,7 @@ func (cs *ConsensusState) OpenWAL(walFile string) (WAL, error) {
 		return nil, err
 	}
 	wal.SetLogger(cs.Logger.With("wal", walFile))
-	if _, err := wal.Start(); err != nil {
+	if err := wal.Start(); err != nil {
 		return nil, err
 	}
 	return wal, nil

consensus/ticker.go

@@ -15,8 +15,8 @@ var (
 // conditional on the height/round/step in the timeoutInfo.
 // The timeoutInfo.Duration may be non-positive.
 type TimeoutTicker interface {
-	Start() (bool, error)
+	Start() error
-	Stop() bool
+	Stop() error
 	Chan() <-chan timeoutInfo       // on which to receive a timeout
 	ScheduleTimeout(ti timeoutInfo) // reset the timer
 

consensus/wal.go

@@ -54,8 +54,8 @@ type WAL interface {
 	Group() *auto.Group
 	SearchForEndHeight(height uint64) (gr *auto.GroupReader, found bool, err error)
 
-	Start() (bool, error)
+	Start() error
-	Stop() bool
+	Stop() error
 	Wait()
 }
 
@@ -102,7 +102,7 @@ func (wal *baseWAL) OnStart() error {
 	} else if size == 0 {
 		wal.Save(EndHeightMessage{0})
 	}
-	_, err = wal.group.Start()
+	err = wal.group.Start()
 	return err
 }
 
@@ -307,6 +307,6 @@ func (nilWAL) Group() *auto.Group { return nil }
 func (nilWAL) SearchForEndHeight(height uint64) (gr *auto.GroupReader, found bool, err error) {
 	return nil, false, nil
 }
-func (nilWAL) Start() (bool, error) { return true, nil }
+func (nilWAL) Start() error { return nil }
-func (nilWAL) Stop() bool           { return true }
+func (nilWAL) Stop() error  { return nil }
-func (nilWAL) Wait()                {}
+func (nilWAL) Wait()        {}

glide.lock

@@ -123,7 +123,7 @@ imports:
   subpackages:
   - iavl
 - name: github.com/tendermint/tmlibs
-  version: b854baa1fce7101c90b1d301b3359bb412f981c0
+  version: 1e12754b3a3b5f1c23bf44c2d882faae688fb2e8
   subpackages:
   - autofile
   - cli

glide.yaml

@@ -34,7 +34,7 @@ import:
   subpackages:
   - iavl
 - package: github.com/tendermint/tmlibs
-  version: ~0.4.1
+  version: 1e12754b3a3b5f1c23bf44c2d882faae688fb2e8
   subpackages:
   - autofile
   - cli

mempool/mempool_test.go

@@ -27,7 +27,7 @@ func newMempoolWithApp(cc proxy.ClientCreator) *Mempool {
 
 	appConnMem, _ := cc.NewABCIClient()
 	appConnMem.SetLogger(log.TestingLogger().With("module", "abci-client", "connection", "mempool"))
-	_, err := appConnMem.Start()
+	err := appConnMem.Start()
 	if err != nil {
 		panic(err)
 	}
@@ -121,7 +121,7 @@ func TestSerialReap(t *testing.T) {
 	mempool := newMempoolWithApp(cc)
 	appConnCon, _ := cc.NewABCIClient()
 	appConnCon.SetLogger(log.TestingLogger().With("module", "abci-client", "connection", "consensus"))
-	if _, err := appConnCon.Start(); err != nil {
+	if err := appConnCon.Start(); err != nil {
 		t.Fatalf("Error starting ABCI client: %v", err.Error())
 	}
 

node/node.go

@@ -165,7 +165,7 @@ func NewNode(config *cfg.Config,
 	handshaker.SetLogger(consensusLogger)
 	proxyApp := proxy.NewAppConns(clientCreator, handshaker)
 	proxyApp.SetLogger(logger.With("module", "proxy"))
-	if _, err := proxyApp.Start(); err != nil {
+	if err := proxyApp.Start(); err != nil {
 		return nil, fmt.Errorf("Error starting proxy app connections: %v", err)
 	}
 
@@ -326,7 +326,7 @@ func NewNode(config *cfg.Config,
 
 // OnStart starts the Node. It implements cmn.Service.
 func (n *Node) OnStart() error {
-	_, err := n.eventBus.Start()
+	err := n.eventBus.Start()
 	if err != nil {
 		return err
 	}
@@ -349,7 +349,7 @@ func (n *Node) OnStart() error {
 	// Start the switch
 	n.sw.SetNodeInfo(n.makeNodeInfo())
 	n.sw.SetNodePrivKey(n.privKey)
-	_, err = n.sw.Start()
+	err = n.sw.Start()
 	if err != nil {
 		return err
 	}

node/node_test.go

@@ -19,7 +19,7 @@ func TestNodeStartStop(t *testing.T) {
 	// create & start node
 	n, err := DefaultNewNode(config, log.TestingLogger())
 	assert.NoError(t, err, "expected no err on DefaultNewNode")
-	_, err1 := n.Start()
+	err1 := n.Start()
 	if err1 != nil {
 		t.Error(err1)
 	}

p2p/connection_test.go

@@ -36,7 +36,7 @@ func TestMConnectionSend(t *testing.T) {
 	defer client.Close() // nolint: errcheck
 
 	mconn := createTestMConnection(client)
-	_, err := mconn.Start()
+	err := mconn.Start()
 	require.Nil(err)
 	defer mconn.Stop()
 
@@ -77,12 +77,12 @@ func TestMConnectionReceive(t *testing.T) {
 		errorsCh <- r
 	}
 	mconn1 := createMConnectionWithCallbacks(client, onReceive, onError)
-	_, err := mconn1.Start()
+	err := mconn1.Start()
 	require.Nil(err)
 	defer mconn1.Stop()
 
 	mconn2 := createTestMConnection(server)
-	_, err = mconn2.Start()
+	err = mconn2.Start()
 	require.Nil(err)
 	defer mconn2.Stop()
 
@@ -107,7 +107,7 @@ func TestMConnectionStatus(t *testing.T) {
 	defer client.Close() // nolint: errcheck
 
 	mconn := createTestMConnection(client)
-	_, err := mconn.Start()
+	err := mconn.Start()
 	require.Nil(err)
 	defer mconn.Stop()
 
@@ -132,7 +132,7 @@ func TestMConnectionStopsAndReturnsError(t *testing.T) {
 		errorsCh <- r
 	}
 	mconn := createMConnectionWithCallbacks(client, onReceive, onError)
-	_, err := mconn.Start()
+	err := mconn.Start()
 	require.Nil(err)
 	defer mconn.Stop()
 
@@ -164,7 +164,7 @@ func newClientAndServerConnsForReadErrors(require *require.Assertions, chOnErr c
 	}
 	mconnClient := NewMConnection(client, chDescs, onReceive, onError)
 	mconnClient.SetLogger(log.TestingLogger().With("module", "client"))
-	_, err := mconnClient.Start()
+	err := mconnClient.Start()
 	require.Nil(err)
 
 	// create server conn with 1 channel
@@ -175,7 +175,7 @@ func newClientAndServerConnsForReadErrors(require *require.Assertions, chOnErr c
 	}
 	mconnServer := createMConnectionWithCallbacks(server, onReceive, onError)
 	mconnServer.SetLogger(serverLogger)
-	_, err = mconnServer.Start()
+	err = mconnServer.Start()
 	require.Nil(err)
 	return mconnClient, mconnServer
 }
@@ -288,7 +288,7 @@ func TestMConnectionTrySend(t *testing.T) {
 	defer client.Close()
 
 	mconn := createTestMConnection(client)
-	_, err := mconn.Start()
+	err := mconn.Start()
 	require.Nil(err)
 	defer mconn.Stop()
 

p2p/listener.go

@@ -16,7 +16,7 @@ type Listener interface {
 	InternalAddress() *NetAddress
 	ExternalAddress() *NetAddress
 	String() string
-	Stop() bool
+	Stop() error
 }
 
 // Implements Listener
@@ -100,7 +100,7 @@ func NewDefaultListener(protocol string, lAddr string, skipUPNP bool, logger log
 		connections: make(chan net.Conn, numBufferedConnections),
 	}
 	dl.BaseService = *cmn.NewBaseService(logger, "DefaultListener", dl)
-	_, err = dl.Start() // Started upon construction
+	err = dl.Start() // Started upon construction
 	if err != nil {
 		logger.Error("Error starting base service", "err", err)
 	}

p2p/peer.go

@@ -235,7 +235,7 @@ func (p *peer) OnStart() error {
 	if err := p.BaseService.OnStart(); err != nil {
 		return err
 	}
-	_, err := p.mconn.Start()
+	err := p.mconn.Start()
 	return err
 }
 

p2p/peer_test.go

@@ -23,7 +23,7 @@ func TestPeerBasic(t *testing.T) {
 	p, err := createOutboundPeerAndPerformHandshake(rp.Addr(), DefaultPeerConfig())
 	require.Nil(err)
 
-	_, err = p.Start()
+	err = p.Start()
 	require.Nil(err)
 	defer p.Stop()
 
@@ -50,7 +50,7 @@ func TestPeerWithoutAuthEnc(t *testing.T) {
 	p, err := createOutboundPeerAndPerformHandshake(rp.Addr(), config)
 	require.Nil(err)
 
-	_, err = p.Start()
+	err = p.Start()
 	require.Nil(err)
 	defer p.Stop()
 
@@ -71,7 +71,7 @@ func TestPeerSend(t *testing.T) {
 	p, err := createOutboundPeerAndPerformHandshake(rp.Addr(), config)
 	require.Nil(err)
 
-	_, err = p.Start()
+	err = p.Start()
 	require.Nil(err)
 
 	defer p.Stop()

p2p/pex_reactor.go

@@ -69,8 +69,8 @@ func (r *PEXReactor) OnStart() error {
 	if err := r.BaseReactor.OnStart(); err != nil {
 		return err
 	}
-	_, err := r.book.Start()
+	err := r.book.Start()
-	if err != nil {
+	if err != nil && err != cmn.ErrAlreadyStarted {
 		return err
 	}
 	go r.ensurePeersRoutine()

p2p/pex_reactor_test.go

@@ -62,13 +62,11 @@ func TestPEXReactorAddRemovePeer(t *testing.T) {
 }
 
 func TestPEXReactorRunning(t *testing.T) {
-	require := require.New(t)
-
 	N := 3
 	switches := make([]*Switch, N)
 
 	dir, err := ioutil.TempDir("", "pex_reactor")
-	require.Nil(err)
+	require.Nil(t, err)
 	defer os.RemoveAll(dir) // nolint: errcheck
 	book := NewAddrBook(dir+"addrbook.json", false)
 	book.SetLogger(log.TestingLogger())
@@ -95,8 +93,8 @@ func TestPEXReactorRunning(t *testing.T) {
 
 	// start switches
 	for _, s := range switches {
-		_, err := s.Start() // start switch and reactors
+		err := s.Start() // start switch and reactors
-		require.Nil(err)
+		require.Nil(t, err)
 	}
 
 	assertSomePeersWithTimeout(t, switches, 10*time.Millisecond, 10*time.Second)

p2p/switch.go

@@ -1,12 +1,13 @@
 package p2p
 
 import (
-	"errors"
 	"fmt"
 	"math/rand"
 	"net"
 	"time"
 
+	"github.com/pkg/errors"
+
 	crypto "github.com/tendermint/go-crypto"
 	cfg "github.com/tendermint/tendermint/config"
 	cmn "github.com/tendermint/tmlibs/common"
@@ -174,17 +175,13 @@ func (sw *Switch) SetNodePrivKey(nodePrivKey crypto.PrivKeyEd25519) {
 
 // OnStart implements BaseService. It starts all the reactors, peers, and listeners.
 func (sw *Switch) OnStart() error {
-	if err := sw.BaseService.OnStart(); err != nil {
-		return err
-	}
 	// Start reactors
 	for _, reactor := range sw.reactors {
-		_, err := reactor.Start()
+		err := reactor.Start()
 		if err != nil {
-			return err
+			return errors.Wrapf(err, "failed to start %v", reactor)
 		}
 	}
-
 	// Start listeners
 	for _, listener := range sw.listeners {
 		go sw.listenerRoutine(listener)
@@ -194,7 +191,6 @@ func (sw *Switch) OnStart() error {
 
 // OnStop implements BaseService. It stops all listeners, peers, and reactors.
 func (sw *Switch) OnStop() {
-	sw.BaseService.OnStop()
 	// Stop listeners
 	for _, listener := range sw.listeners {
 		listener.Stop()
@@ -289,7 +285,7 @@ func (sw *Switch) SetPubKeyFilter(f func(crypto.PubKeyEd25519) error) {
 }
 
 func (sw *Switch) startInitPeer(peer *peer) {
-	_, err := peer.Start() // spawn send/recv routines
+	err := peer.Start() // spawn send/recv routines
 	if err != nil {
 		// Should never happen
 		sw.Logger.Error("Error starting peer", "peer", peer, "err", err)
@@ -547,7 +543,7 @@ func Connect2Switches(switches []*Switch, i, j int) {
 // It returns the first encountered error.
 func StartSwitches(switches []*Switch) error {
 	for _, s := range switches {
-		_, err := s.Start() // start switch and reactors
+		err := s.Start() // start switch and reactors
 		if err != nil {
 			return err
 		}

p2p/switch_test.go

@@ -225,7 +225,7 @@ func TestSwitchStopsNonPersistentPeerOnError(t *testing.T) {
 	assert, require := assert.New(t), require.New(t)
 
 	sw := makeSwitch(config, 1, "testing", "123.123.123", initSwitchFunc)
-	_, err := sw.Start()
+	err := sw.Start()
 	if err != nil {
 		t.Error(err)
 	}
@@ -252,7 +252,7 @@ func TestSwitchReconnectsToPersistentPeer(t *testing.T) {
 	assert, require := assert.New(t), require.New(t)
 
 	sw := makeSwitch(config, 1, "testing", "123.123.123", initSwitchFunc)
-	_, err := sw.Start()
+	err := sw.Start()
 	if err != nil {
 		t.Error(err)
 	}

proxy/app_conn_test.go

@@ -51,7 +51,7 @@ func TestEcho(t *testing.T) {
 	// Start server
 	s := server.NewSocketServer(sockPath, dummy.NewDummyApplication())
 	s.SetLogger(log.TestingLogger().With("module", "abci-server"))
-	if _, err := s.Start(); err != nil {
+	if err := s.Start(); err != nil {
 		t.Fatalf("Error starting socket server: %v", err.Error())
 	}
 	defer s.Stop()
@@ -62,7 +62,7 @@ func TestEcho(t *testing.T) {
 		t.Fatalf("Error creating ABCI client: %v", err.Error())
 	}
 	cli.SetLogger(log.TestingLogger().With("module", "abci-client"))
-	if _, err := cli.Start(); err != nil {
+	if err := cli.Start(); err != nil {
 		t.Fatalf("Error starting ABCI client: %v", err.Error())
 	}
 
@@ -85,7 +85,7 @@ func BenchmarkEcho(b *testing.B) {
 	// Start server
 	s := server.NewSocketServer(sockPath, dummy.NewDummyApplication())
 	s.SetLogger(log.TestingLogger().With("module", "abci-server"))
-	if _, err := s.Start(); err != nil {
+	if err := s.Start(); err != nil {
 		b.Fatalf("Error starting socket server: %v", err.Error())
 	}
 	defer s.Stop()
@@ -96,7 +96,7 @@ func BenchmarkEcho(b *testing.B) {
 		b.Fatalf("Error creating ABCI client: %v", err.Error())
 	}
 	cli.SetLogger(log.TestingLogger().With("module", "abci-client"))
-	if _, err := cli.Start(); err != nil {
+	if err := cli.Start(); err != nil {
 		b.Fatalf("Error starting ABCI client: %v", err.Error())
 	}
 
@@ -124,7 +124,7 @@ func TestInfo(t *testing.T) {
 	// Start server
 	s := server.NewSocketServer(sockPath, dummy.NewDummyApplication())
 	s.SetLogger(log.TestingLogger().With("module", "abci-server"))
-	if _, err := s.Start(); err != nil {
+	if err := s.Start(); err != nil {
 		t.Fatalf("Error starting socket server: %v", err.Error())
 	}
 	defer s.Stop()
@@ -135,7 +135,7 @@ func TestInfo(t *testing.T) {
 		t.Fatalf("Error creating ABCI client: %v", err.Error())
 	}
 	cli.SetLogger(log.TestingLogger().With("module", "abci-client"))
-	if _, err := cli.Start(); err != nil {
+	if err := cli.Start(); err != nil {
 		t.Fatalf("Error starting ABCI client: %v", err.Error())
 	}
 

proxy/multi_app_conn.go

@@ -76,7 +76,7 @@ func (app *multiAppConn) OnStart() error {
 		return errors.Wrap(err, "Error creating ABCI client (query connection)")
 	}
 	querycli.SetLogger(app.Logger.With("module", "abci-client", "connection", "query"))
-	if _, err := querycli.Start(); err != nil {
+	if err := querycli.Start(); err != nil {
 		return errors.Wrap(err, "Error starting ABCI client (query connection)")
 	}
 	app.queryConn = NewAppConnQuery(querycli)
@@ -87,7 +87,7 @@ func (app *multiAppConn) OnStart() error {
 		return errors.Wrap(err, "Error creating ABCI client (mempool connection)")
 	}
 	memcli.SetLogger(app.Logger.With("module", "abci-client", "connection", "mempool"))
-	if _, err := memcli.Start(); err != nil {
+	if err := memcli.Start(); err != nil {
 		return errors.Wrap(err, "Error starting ABCI client (mempool connection)")
 	}
 	app.mempoolConn = NewAppConnMempool(memcli)
@@ -98,7 +98,7 @@ func (app *multiAppConn) OnStart() error {
 		return errors.Wrap(err, "Error creating ABCI client (consensus connection)")
 	}
 	concli.SetLogger(app.Logger.With("module", "abci-client", "connection", "consensus"))
-	if _, err := concli.Start(); err != nil {
+	if err := concli.Start(); err != nil {
 		return errors.Wrap(err, "Error starting ABCI client (consensus connection)")
 	}
 	app.consensusConn = NewAppConnConsensus(concli)

rpc/client/event_test.go

@@ -27,9 +27,8 @@ func TestHeaderEvents(t *testing.T) {
 		// start for this test it if it wasn't already running
 		if !c.IsRunning() {
 			// if so, then we start it, listen, and stop it.
-			st, err := c.Start()
+			err := c.Start()
 			require.Nil(err, "%d: %+v", i, err)
-			require.True(st, "%d", i)
 			defer c.Stop()
 		}
 
@@ -48,9 +47,8 @@ func TestBlockEvents(t *testing.T) {
 		// start for this test it if it wasn't already running
 		if !c.IsRunning() {
 			// if so, then we start it, listen, and stop it.
-			st, err := c.Start()
+			err := c.Start()
 			require.Nil(err, "%d: %+v", i, err)
-			require.True(st, "%d", i)
 			defer c.Stop()
 		}
 
@@ -80,9 +78,8 @@ func TestTxEventsSentWithBroadcastTxAsync(t *testing.T) {
 		// start for this test it if it wasn't already running
 		if !c.IsRunning() {
 			// if so, then we start it, listen, and stop it.
-			st, err := c.Start()
+			err := c.Start()
 			require.Nil(err, "%d: %+v", i, err)
-			require.True(st, "%d", i)
 			defer c.Stop()
 		}
 
@@ -113,9 +110,8 @@ func TestTxEventsSentWithBroadcastTxSync(t *testing.T) {
 		// start for this test it if it wasn't already running
 		if !c.IsRunning() {
 			// if so, then we start it, listen, and stop it.
-			st, err := c.Start()
+			err := c.Start()
 			require.Nil(err, "%d: %+v", i, err)
-			require.True(st, "%d", i)
 			defer c.Stop()
 		}
 

rpc/client/httpclient.go

@@ -215,26 +215,26 @@ func newWSEvents(remote, endpoint string) *WSEvents {
 // Start is the only way I could think the extend OnStart from
 // events.eventSwitch.  If only it wasn't private...
 // BaseService.Start -> eventSwitch.OnStart -> WSEvents.Start
-func (w *WSEvents) Start() (bool, error) {
+func (w *WSEvents) Start() error {
 	ws := rpcclient.NewWSClient(w.remote, w.endpoint, rpcclient.OnReconnect(func() {
 		w.redoSubscriptions()
 	}))
-	started, err := ws.Start()
+	err := ws.Start()
 	if err == nil {
 		w.ws = ws
 		go w.eventListener()
 	}
-	return started, errors.Wrap(err, "StartWSEvent")
+	return err
 }
 
 // Stop wraps the BaseService/eventSwitch actions as Start does
-func (w *WSEvents) Stop() bool {
+func (w *WSEvents) Stop() error {
 	// send a message to quit to stop the eventListener
 	w.quit <- true
 	<-w.done
 	w.ws.Stop()
 	w.ws = nil
-	return true
+	return nil
 }
 
 func (w *WSEvents) Subscribe(ctx context.Context, query string, out chan<- interface{}) error {

rpc/lib/client/ws_client.go

@@ -47,10 +47,10 @@ type WSClient struct {
 	onReconnect func()
 
 	// internal channels
-	send             chan types.RPCRequest // user requests
+	send            chan types.RPCRequest // user requests
-	backlog          chan types.RPCRequest // stores a single user request received during a conn failure
+	backlog         chan types.RPCRequest // stores a single user request received during a conn failure
-	reconnectAfter   chan error            // reconnect requests
+	reconnectAfter  chan error            // reconnect requests
-	readRoutineQuit  chan struct{}         // a way for readRoutine to close writeRoutine
+	readRoutineQuit chan struct{}         // a way for readRoutine to close writeRoutine
 
 	wg sync.WaitGroup
 
@@ -168,12 +168,14 @@ func (c *WSClient) OnStop() {}
 
 // Stop overrides cmn.Service#Stop. There is no other way to wait until Quit
 // channel is closed.
-func (c *WSClient) Stop() bool {
+func (c *WSClient) Stop() error {
-	success := c.BaseService.Stop()
+	err := c.BaseService.Stop()
-	// only close user-facing channels when we can't write to them
+	if err == nil {
-	c.wg.Wait()
+		// only close user-facing channels when we can't write to them
-	close(c.ResponsesCh)
+		c.wg.Wait()
-	return success
+		close(c.ResponsesCh)
+	}
+	return err
 }
 
 // IsReconnecting returns true if the client is reconnecting right now.

rpc/lib/client/ws_client_test.go

@@ -196,7 +196,7 @@ func TestNotBlockingOnStop(t *testing.T) {
 
 func startClient(t *testing.T, addr net.Addr) *WSClient {
 	c := NewWSClient(addr.String(), "/websocket")
-	_, err := c.Start()
+	err := c.Start()
 	require.Nil(t, err)
 	c.SetLogger(log.TestingLogger())
 	return c

rpc/lib/rpc_test.go

@@ -278,7 +278,7 @@ func TestServersAndClientsBasic(t *testing.T) {
 
 		cl3 := client.NewWSClient(addr, websocketEndpoint)
 		cl3.SetLogger(log.TestingLogger())
-		_, err := cl3.Start()
+		err := cl3.Start()
 		require.Nil(t, err)
 		fmt.Printf("=== testing server on %s using %v client", addr, cl3)
 		testWithWSClient(t, cl3)
@@ -307,7 +307,7 @@ func TestQuotedStringArg(t *testing.T) {
 func TestWSNewWSRPCFunc(t *testing.T) {
 	cl := client.NewWSClient(tcpAddr, websocketEndpoint)
 	cl.SetLogger(log.TestingLogger())
-	_, err := cl.Start()
+	err := cl.Start()
 	require.Nil(t, err)
 	defer cl.Stop()
 
@@ -332,7 +332,7 @@ func TestWSNewWSRPCFunc(t *testing.T) {
 func TestWSHandlesArrayParams(t *testing.T) {
 	cl := client.NewWSClient(tcpAddr, websocketEndpoint)
 	cl.SetLogger(log.TestingLogger())
-	_, err := cl.Start()
+	err := cl.Start()
 	require.Nil(t, err)
 	defer cl.Stop()
 
@@ -357,7 +357,7 @@ func TestWSHandlesArrayParams(t *testing.T) {
 func TestWSClientPingPong(t *testing.T) {
 	cl := client.NewWSClient(tcpAddr, websocketEndpoint)
 	cl.SetLogger(log.TestingLogger())
-	_, err := cl.Start()
+	err := cl.Start()
 	require.Nil(t, err)
 	defer cl.Stop()
 

rpc/lib/server/handlers.go

@@ -723,7 +723,7 @@ func (wm *WebsocketManager) WebsocketHandler(w http.ResponseWriter, r *http.Requ
 	con := NewWSConnection(wsConn, wm.funcMap, wm.wsConnOptions...)
 	con.SetLogger(wm.logger.With("remote", wsConn.RemoteAddr()))
 	wm.logger.Info("New websocket connection", "remote", con.remoteAddr)
-	_, err = con.Start() // Blocking
+	err = con.Start() // Blocking
 	if err != nil {
 		wm.logger.Error("Error starting connection", "err", err)
 	}

rpc/test/helpers.go

@@ -92,7 +92,7 @@ func GetGRPCClient() core_grpc.BroadcastAPIClient {
 // StartTendermint starts a test tendermint server in a go routine and returns when it is initialized
 func StartTendermint(app abci.Application) *nm.Node {
 	node := NewTendermint(app)
-	_, err := node.Start()
+	err := node.Start()
 	if err != nil {
 		panic(err)
 	}

state/execution_test.go

@@ -25,7 +25,7 @@ var (
 func TestApplyBlock(t *testing.T) {
 	cc := proxy.NewLocalClientCreator(dummy.NewDummyApplication())
 	proxyApp := proxy.NewAppConns(cc, nil)
-	_, err := proxyApp.Start()
+	err := proxyApp.Start()
 	require.Nil(t, err)
 	defer proxyApp.Stop()