[WIP] Upgrade tendermint to 0315

Gopkg.toml

@@ -59,7 +59,7 @@
 [[override]]
   name = "github.com/tendermint/tendermint"
   source = "github.com/binance-chain/bnc-tendermint"
-  version = "=v0.30.1-binance.0"
+  branch = "develop"
 
 ## deps without releases:
 

baseapp/helpers.go

@@ -2,8 +2,6 @@ package baseapp
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/tendermint/tendermint/abci/server"
-	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 	cmn "github.com/tendermint/tendermint/libs/common"
 )
@@ -25,28 +23,3 @@ func (app *BaseApp) Deliver(tx sdk.Tx) (result sdk.Result) {
 	txHash := cmn.HexBytes(tmhash.Sum(nil)).String()
 	return app.RunTx(sdk.RunTxModeDeliver, nil, tx, txHash)
 }
-
-// RunForever - BasecoinApp execution and cleanup
-func RunForever(app abci.Application) {
-
-	// Start the ABCI server
-	srv, err := server.NewServer("0.0.0.0:26658", "socket", app)
-	if err != nil {
-		cmn.Exit(err.Error())
-		return
-	}
-	err = srv.Start()
-	if err != nil {
-		cmn.Exit(err.Error())
-		return
-	}
-
-	// Wait forever
-	cmn.TrapSignal(func() {
-		// Cleanup
-		err := srv.Stop()
-		if err != nil {
-			cmn.Exit(err.Error())
-		}
-	})
-}

client/lcd/root.go

@@ -12,6 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/rpc"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/server"
 	auth "github.com/cosmos/cosmos-sdk/x/auth/client/rest"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/client/rest"
 	gov "github.com/cosmos/cosmos-sdk/x/gov/client/rest"
@@ -21,7 +22,6 @@ import (
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	cmn "github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/libs/log"
 	tmserver "github.com/tendermint/tendermint/rpc/lib/server"
 )
@@ -58,12 +58,13 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 			var listener net.Listener
 			var fingerprint string
 			if viper.GetBool(flagInsecure) {
-				listener, err := tmserver.Listen(listenAddr, tmserver.Config{MaxOpenConnections: maxOpen})
+				cfg := &tmserver.Config{MaxOpenConnections: maxOpen}
+				listener, err := tmserver.Listen(listenAddr, cfg)
 				if err != nil {
 					return err
 				}
 				go func() {
-					if err = tmserver.StartHTTPServer(listener, handler, logger); err != nil {
+					if err = tmserver.StartHTTPServer(listener, handler, logger, cfg); err != nil {
 						panic(err)
 					}
 				}()
@@ -91,12 +92,13 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 					}
 					defer cleanupFunc()
 				}
-				listener, err := tmserver.Listen(listenAddr, tmserver.Config{MaxOpenConnections: maxOpen})
+				cfg := &tmserver.Config{MaxOpenConnections: maxOpen}
+				listener, err := tmserver.Listen(listenAddr, cfg)
 				if err != nil {
 					return err
 				}
 				go func() {
-					if err = tmserver.StartHTTPServer(listener, handler, logger); err != nil {
+					if err = tmserver.StartHTTPAndTLSServer(listener, handler, certFile, keyFile, logger, cfg); err != nil {
 						panic(err)
 					}
 				}()
@@ -105,7 +107,7 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 			logger.Info("REST server started")
 
 			// wait forever and cleanup
-			cmn.TrapSignal(func() {
+			server.TrapSignal(func() {
 				defer cleanupFunc()
 				err := listener.Close()
 				logger.Error("error closing listener", "err", err)

client/lcd/test_helpers.go

@@ -334,12 +334,12 @@ func startTM(
 //
 // NOTE: This causes the thread to block.
 func startLCD(logger log.Logger, listenAddr string, cdc *codec.Codec) (net.Listener, error) {
-	listener, err := tmrpc.Listen(listenAddr, tmrpc.Config{})
+	listener, err := tmrpc.Listen(listenAddr, &tmrpc.Config{})
 	if err != nil {
 		return nil, err
 	}
 
-	go tmrpc.StartHTTPServer(listener, createHandler(cdc), logger)
+	go tmrpc.StartHTTPServer(listener, createHandler(cdc), logger, &tmrpc.Config{})
 	return listener, nil
 }
 

server/start.go

@@ -87,13 +87,14 @@ func startStandAlone(ctx *Context, appCreator AppCreator) error {
 	}
 
 	// wait forever
-	cmn.TrapSignal(func() {
+	cmn.TrapSignal(ctx.Logger, func() {
 		// cleanup
 		err = svr.Stop()
 		if err != nil {
 			cmn.Exit(err.Error())
 		}
 	})
+	select {}
 	return nil
 }