From 149c9ed82ee1bf2ec7c5393583a4e89cced5ec25 Mon Sep 17 00:00:00 2001 From: Andrew Chiw Date: Mon, 10 Oct 2022 13:41:01 +0200 Subject: [PATCH] pass logger config to mockserver closes #363 --- da/grpc/mockserv/cmd/main.go | 5 ++++- da/grpc/mockserv/mockserv.go | 5 +---- da/test/da_test.go | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/da/grpc/mockserv/cmd/main.go b/da/grpc/mockserv/cmd/main.go index ed03867c72..4ff70642c7 100644 --- a/da/grpc/mockserv/cmd/main.go +++ b/da/grpc/mockserv/cmd/main.go @@ -4,15 +4,18 @@ import ( "flag" "log" "net" + "os" "strconv" grpcda "github.com/celestiaorg/rollmint/da/grpc" "github.com/celestiaorg/rollmint/da/grpc/mockserv" "github.com/celestiaorg/rollmint/store" + tmlog "github.com/tendermint/tendermint/libs/log" ) func main() { conf := grpcda.DefaultConfig + logger := tmlog.NewTMLogger(os.Stdout) flag.IntVar(&conf.Port, "port", conf.Port, "listening port") flag.StringVar(&conf.Host, "host", "0.0.0.0", "listening address") @@ -24,7 +27,7 @@ func main() { log.Panic(err) } log.Println("Listening on:", lis.Addr()) - srv := mockserv.GetServer(kv, conf, nil) + srv := mockserv.GetServer(kv, conf, nil, logger) if err := srv.Serve(lis); err != nil { log.Println("error while serving:", err) } diff --git a/da/grpc/mockserv/mockserv.go b/da/grpc/mockserv/mockserv.go index c5e151d290..a7c2644d7a 100644 --- a/da/grpc/mockserv/mockserv.go +++ b/da/grpc/mockserv/mockserv.go @@ -2,7 +2,6 @@ package mockserv import ( "context" - "os" tmlog "github.com/tendermint/tendermint/libs/log" "google.golang.org/grpc" @@ -16,9 +15,7 @@ import ( ) // GetServer creates and returns gRPC server instance. -func GetServer(kv store.KVStore, conf grpcda.Config, mockConfig []byte) *grpc.Server { - logger := tmlog.NewTMLogger(os.Stdout) - +func GetServer(kv store.KVStore, conf grpcda.Config, mockConfig []byte, logger tmlog.Logger) *grpc.Server { srv := grpc.NewServer() mockImpl := &mockImpl{} err := mockImpl.mock.Init([8]byte{}, mockConfig, kv, logger) diff --git a/da/test/da_test.go b/da/test/da_test.go index e9e8326688..bd85839396 100644 --- a/da/test/da_test.go +++ b/da/test/da_test.go @@ -4,6 +4,7 @@ import ( "encoding/json" "math/rand" "net" + "os" "strconv" "testing" "time" @@ -22,6 +23,7 @@ import ( "github.com/celestiaorg/rollmint/log/test" "github.com/celestiaorg/rollmint/store" "github.com/celestiaorg/rollmint/types" + tmlog "github.com/tendermint/tendermint/libs/log" ) const mockDaBlockTime = 100 * time.Millisecond @@ -142,7 +144,9 @@ func TestRetrieve(t *testing.T) { func startMockGRPCServ(t *testing.T) *grpc.Server { t.Helper() conf := grpcda.DefaultConfig - srv := mockserv.GetServer(store.NewDefaultInMemoryKVStore(), conf, []byte(mockDaBlockTime.String())) + logger := tmlog.NewTMLogger(os.Stdout) + + srv := mockserv.GetServer(store.NewDefaultInMemoryKVStore(), conf, []byte(mockDaBlockTime.String()), logger) lis, err := net.Listen("tcp", conf.Host+":"+strconv.Itoa(conf.Port)) if err != nil { t.Fatal(err)