mirror of
https://github.com/fluencelabs/tendermint
synced 2025-07-30 19:51:58 +00:00
introduce testing logger
This commit is contained in:
@@ -16,7 +16,7 @@ func main() {
|
||||
abciPtr := flag.String("abci", "socket", "socket | grpc")
|
||||
flag.Parse()
|
||||
|
||||
logger := log.NewTmLogger(os.Stdout)
|
||||
logger := log.NewTMLogger(os.Stdout)
|
||||
|
||||
// Start the listener
|
||||
srv, err := server.NewServer(*addrPtr, *abciPtr, NewChainAwareApplication())
|
||||
|
@@ -1,7 +1,6 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
@@ -14,14 +13,13 @@ import (
|
||||
|
||||
func TestChainAware(t *testing.T) {
|
||||
app := NewChainAwareApplication()
|
||||
logger := log.NewTmLogger(os.Stdout)
|
||||
|
||||
// Start the listener
|
||||
srv, err := server.NewServer("unix://test.sock", "socket", app)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
srv.SetLogger(log.With(logger, "module", "abci-server"))
|
||||
srv.SetLogger(log.With(log.TestingLogger(), "module", "abci-server"))
|
||||
defer srv.Stop()
|
||||
|
||||
// Connect to the socket
|
||||
@@ -29,7 +27,7 @@ func TestChainAware(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("Error starting socket client: %v", err.Error())
|
||||
}
|
||||
client.SetLogger(log.With(logger, "module", "abci-client"))
|
||||
client.SetLogger(log.With(log.TestingLogger(), "module", "abci-client"))
|
||||
client.Start()
|
||||
defer client.Stop()
|
||||
|
||||
|
@@ -213,7 +213,7 @@ func valsEqual(t *testing.T, vals1, vals2 []*types.Validator) {
|
||||
func makeSocketClientServer(app types.Application, name string) (abcicli.Client, cmn.Service, error) {
|
||||
// Start the listener
|
||||
socket := cmn.Fmt("unix://%s.sock", name)
|
||||
logger := log.NewTmLogger(os.Stdout)
|
||||
logger := log.NewTMLogger(os.Stdout)
|
||||
|
||||
server, err := server.NewSocketServer(socket, app)
|
||||
if err != nil {
|
||||
@@ -236,7 +236,7 @@ func makeSocketClientServer(app types.Application, name string) (abcicli.Client,
|
||||
func makeGRPCClientServer(app types.Application, name string) (abcicli.Client, cmn.Service, error) {
|
||||
// Start the listener
|
||||
socket := cmn.Fmt("unix://%s.sock", name)
|
||||
logger := log.NewTmLogger(os.Stdout)
|
||||
logger := log.NewTMLogger(os.Stdout)
|
||||
|
||||
gapp := types.NewGRPCApplication(app)
|
||||
server, err := server.NewGRPCServer(socket, gapp)
|
||||
|
@@ -3,7 +3,6 @@ package example
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"reflect"
|
||||
"testing"
|
||||
"time"
|
||||
@@ -36,16 +35,14 @@ func TestGRPC(t *testing.T) {
|
||||
}
|
||||
|
||||
func testStream(t *testing.T, app types.Application) {
|
||||
|
||||
numDeliverTxs := 200000
|
||||
logger := log.NewTmLogger(os.Stdout)
|
||||
|
||||
// Start the listener
|
||||
server, err := server.NewSocketServer("unix://test.sock", app)
|
||||
if err != nil {
|
||||
t.Fatalf("Error starting socket server: %v", err.Error())
|
||||
}
|
||||
server.SetLogger(log.With(logger, "module", "abci-server"))
|
||||
server.SetLogger(log.With(log.TestingLogger(), "module", "abci-server"))
|
||||
defer server.Stop()
|
||||
|
||||
// Connect to the socket
|
||||
@@ -53,7 +50,7 @@ func testStream(t *testing.T, app types.Application) {
|
||||
if err != nil {
|
||||
t.Fatalf("Error starting socket client: %v", err.Error())
|
||||
}
|
||||
client.SetLogger(log.With(logger, "module", "abci-client"))
|
||||
client.SetLogger(log.With(log.TestingLogger(), "module", "abci-client"))
|
||||
client.Start()
|
||||
defer client.Stop()
|
||||
|
||||
@@ -112,16 +109,14 @@ func dialerFunc(addr string, timeout time.Duration) (net.Conn, error) {
|
||||
}
|
||||
|
||||
func testGRPCSync(t *testing.T, app *types.GRPCApplication) {
|
||||
|
||||
numDeliverTxs := 2000
|
||||
logger := log.NewTmLogger(os.Stdout)
|
||||
|
||||
// Start the listener
|
||||
server, err := server.NewGRPCServer("unix://test.sock", app)
|
||||
if err != nil {
|
||||
t.Fatalf("Error starting GRPC server: %v", err.Error())
|
||||
}
|
||||
server.SetLogger(log.With(logger, "module", "abci-server"))
|
||||
server.SetLogger(log.With(log.TestingLogger(), "module", "abci-server"))
|
||||
defer server.Stop()
|
||||
|
||||
// Connect to the socket
|
||||
|
Reference in New Issue
Block a user