mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-06 16:17:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

NewXXXServer doesnt run Start or return error

Browse Source
This commit is contained in:
Ethan Buchman
2017-05-15 12:51:24 -04:00
parent 21fff49f2c
commit d07b2352ad
9 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/block_aware/block_aware_app.go
+4
View File
@@ -25,6 +25,10 @@ func main() {
os.Exit(1)
}
srv.SetLogger(logger.With("module", "abci-server"))
if _, err := srv.Start(); err != nil {
logger.Error(err.Error())
os.Exit(1)
}
// Wait forever
cmn.TrapSignal(func() {
example/block_aware/block_aware_test.go
+3
View File
@@ -20,6 +20,9 @@ func TestChainAware(t *testing.T) {
t.Fatal(err)
}
srv.SetLogger(log.TestingLogger().With("module", "abci-server"))
if _, err := srv.Start(); err != nil {
t.Fatal(err.Error())
}
defer srv.Stop()
// Connect to the socket
example/dummy/dummy_test.go
+10 -11
View File
@@ -214,22 +214,21 @@ func makeSocketClientServer(app types.Application, name string) (abcicli.Client,
socket := cmn.Fmt("unix://%s.sock", name)
logger := log.TestingLogger()
server, err := server.NewSocketServer(socket, app)
if err != nil {
server := server.NewSocketServer(socket, app)
server.SetLogger(logger.With("module", "abci-server"))
if _, err := server.Start(); err != nil {
return nil, nil, err
}
server.SetLogger(logger.With("module", "abci-server"))
// Connect to the socket
client := abcicli.NewSocketClient(socket, false)
client.SetLogger(logger.With("module", "abci-client"))
if _, err := client.Start(); err != nil {
server.Stop()
return nil, nil, err
}
client.SetLogger(logger.With("module", "abci-client"))
client.Start()
return client, server, err
return client, server, nil
}
func makeGRPCClientServer(app types.Application, name string) (abcicli.Client, cmn.Service, error) {
@@ -238,19 +237,19 @@ func makeGRPCClientServer(app types.Application, name string) (abcicli.Client, c
logger := log.TestingLogger()
gapp := types.NewGRPCApplication(app)
server, err := server.NewGRPCServer(socket, gapp)
if err != nil {
server := server.NewGRPCServer(socket, gapp)
server.SetLogger(logger.With("module", "abci-server"))
if _, err := server.Start(); err != nil {
return nil, nil, err
}
server.SetLogger(logger.With("module", "abci-server"))
client := abcicli.NewGRPCClient(socket, true)
client.SetLogger(logger.With("module", "abci-client"))
if _, err := client.Start(); err != nil {
server.Stop()
return nil, nil, err
}
client.SetLogger(logger.With("module", "abci-client"))
return client, server, err
return client, server, nil
}
func TestClientServer(t *testing.T) {
example/example_test.go
+4 -4
View File
@@ -38,8 +38,8 @@ func testStream(t *testing.T, app types.Application) {
numDeliverTxs := 200000
// Start the listener
server, err := server.NewSocketServer("unix://test.sock", app)
if err != nil {
server := server.NewSocketServer("unix://test.sock", app)
if _, err := server.Start(); err != nil {
t.Fatalf("Error starting socket server: %v", err.Error())
}
server.SetLogger(log.TestingLogger().With("module", "abci-server"))
@@ -112,8 +112,8 @@ func testGRPCSync(t *testing.T, app *types.GRPCApplication) {
numDeliverTxs := 2000
// Start the listener
server, err := server.NewGRPCServer("unix://test.sock", app)
if err != nil {
server := server.NewGRPCServer("unix://test.sock", app)
if _, err := server.Start(); err != nil {
t.Fatalf("Error starting GRPC server: %v", err.Error())
}
server.SetLogger(log.TestingLogger().With("module", "abci-server"))