From 95a0b863a224605e34397e072424fb6b912a147e Mon Sep 17 00:00:00 2001 From: Jeffrey Picard Date: Wed, 7 Dec 2022 12:46:51 +0000 Subject: [PATCH] cleanup and fix a bunch of compiler warnings --- server/federation_test.go | 18 ++++++++++++------ server/jsonrpc_blockchain_test.go | 3 +++ server/jsonrpc_claimtrie.go | 3 +-- server/notifier.go | 4 ++-- server/notifier_test.go | 4 ---- server/server.go | 8 +++++--- server/session.go | 19 ++++++++----------- 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/server/federation_test.go b/server/federation_test.go index 85c87f8..ae085b5 100644 --- a/server/federation_test.go +++ b/server/federation_test.go @@ -4,7 +4,6 @@ import ( "bufio" "context" "fmt" - "log" "net" "os" "strconv" @@ -16,13 +15,20 @@ import ( "github.com/lbryio/herald.go/server" "github.com/lbryio/lbry.go/v3/extras/stop" dto "github.com/prometheus/client_model/go" + log "github.com/sirupsen/logrus" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" ) // lineCountFile takes a fileName and counts the number of lines in it. func lineCountFile(fileName string) int { f, err := os.Open(fileName) - defer f.Close() + defer func() { + err := f.Close() + if err != nil { + log.Warn(err) + } + }() if err != nil { log.Println(err) return 0 @@ -207,7 +213,7 @@ func TestAddPeerEndpoint(t *testing.T) { go hubServer2.Run() //go hubServer.Run() conn, err := grpc.Dial("localhost:"+strconv.Itoa(args.Port), - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock(), ) if err != nil { @@ -282,7 +288,7 @@ func TestAddPeerEndpoint2(t *testing.T) { go hubServer2.Run() go hubServer3.Run() conn, err := grpc.Dial("localhost:"+strconv.Itoa(args.Port), - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock(), ) if err != nil { @@ -372,14 +378,14 @@ func TestAddPeerEndpoint3(t *testing.T) { go hubServer2.Run() go hubServer3.Run() conn, err := grpc.Dial("localhost:"+strconv.Itoa(args.Port), - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock(), ) if err != nil { log.Fatalf("did not connect: %v", err) } conn2, err := grpc.Dial("localhost:50052", - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock(), ) if err != nil { diff --git a/server/jsonrpc_blockchain_test.go b/server/jsonrpc_blockchain_test.go index 634f027..829bdf8 100644 --- a/server/jsonrpc_blockchain_test.go +++ b/server/jsonrpc_blockchain_test.go @@ -185,6 +185,9 @@ func TestHeaders(t *testing.T) { } var resp *BlockHeadersResp err := s.Headers(&req, &resp) + if err != nil { + t.Errorf("Headers: %v", err) + } marshalled, err := json.MarshalIndent(resp, "", " ") if err != nil { t.Errorf("height: %v unmarshal err: %v", height, err) diff --git a/server/jsonrpc_claimtrie.go b/server/jsonrpc_claimtrie.go index 33301b0..f70e462 100644 --- a/server/jsonrpc_claimtrie.go +++ b/server/jsonrpc_claimtrie.go @@ -8,7 +8,6 @@ import ( "github.com/lbryio/herald.go/internal/metrics" pb "github.com/lbryio/herald.go/protobuf/go" "github.com/prometheus/client_golang/prometheus" - "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" ) @@ -102,7 +101,7 @@ func (t *ClaimtrieService) GetClaimByID(args *GetClaimByIDData, result **pb.Outp BlockedTotal: 0, //TODO } - logrus.Warn(res) + log.Warn(res) *result = res return nil diff --git a/server/notifier.go b/server/notifier.go index 1769918..a3a16a2 100644 --- a/server/notifier.go +++ b/server/notifier.go @@ -54,9 +54,9 @@ func (s *Server) DoNotify(heightHash *internal.HeightHash) error { // RunNotifier Runs the notfying action forever func (s *Server) RunNotifier() error { for notification := range s.NotifierChan { - switch notification.(type) { + switch note := notification.(type) { case internal.HeightHash: - heightHash, _ := notification.(internal.HeightHash) + heightHash := note s.DoNotify(&heightHash) // Do we need this? // case peerNotification: diff --git a/server/notifier_test.go b/server/notifier_test.go index d3cd1b5..0bcaa45 100644 --- a/server/notifier_test.go +++ b/server/notifier_test.go @@ -68,15 +68,12 @@ func tcpRead(conn net.Conn) ([]byte, error) { func TestNotifierServer(t *testing.T) { args := server.MakeDefaultTestArgs() - // ctx := context.Background() ctx := stop.NewDebug() hub := server.MakeHubServer(ctx, args) go hub.NotifierServer() go hub.RunNotifier() - // time.Sleep(time.Second * 2) - addr := fmt.Sprintf(":%d", args.NotifierPort) logrus.Info(addr) conn, err := tcpConnReady(addr) @@ -99,7 +96,6 @@ func TestNotifierServer(t *testing.T) { // Hacky but needed because if the reader isn't ready // before the writer sends it won't get the data - // time.Sleep(time.Second * 10) err = subReady(hub) if err != nil { t.Fatal(err) diff --git a/server/server.go b/server/server.go index 2c419b9..2e9ccb0 100644 --- a/server/server.go +++ b/server/server.go @@ -7,7 +7,9 @@ import ( "errors" "fmt" "hash" - "io/ioutil" + + //"io/ioutil" + "log" "net" "net/http" @@ -176,7 +178,7 @@ func (s *Server) Stop() { } func LoadDatabase(args *Args, grp *stop.Group) (*db.ReadOnlyDBColumnFamily, error) { - tmpName, err := ioutil.TempDir("", "go-lbry-hub") + tmpName, err := os.MkdirTemp("", "go-lbry-hub") if err != nil { logrus.Info(err) log.Fatal(err) @@ -433,7 +435,7 @@ func MakeHubServer(grp *stop.Group, args *Args) *Server { // for this hub to allow for metric tracking. func (s *Server) prometheusEndpoint(port string, endpoint string) { http.Handle("/"+endpoint, promhttp.Handler()) - log.Println(fmt.Sprintf("listening on :%s /%s", port, endpoint)) + log.Printf("listening on :%s /%s\n", port, endpoint) err := http.ListenAndServe(":"+port, nil) log.Fatalln("Shouldn't happen??!?!", err) } diff --git a/server/session.go b/server/session.go index 20f598f..6413d06 100644 --- a/server/session.go +++ b/server/session.go @@ -62,12 +62,11 @@ type session struct { func (s *session) doNotify(notification interface{}) { var method string var params interface{} - switch notification.(type) { + switch note := notification.(type) { case headerNotification: if !s.headersSub { return } - note, _ := notification.(headerNotification) heightHash := note.HeightHash method = "blockchain.headers.subscribe" if s.headersSubRaw { @@ -87,7 +86,6 @@ func (s *session) doNotify(notification interface{}) { params = header } case hashXNotification: - note, _ := notification.(hashXNotification) orig, ok := s.hashXSubs[note.hashX] if !ok { return @@ -106,7 +104,6 @@ func (s *session) doNotify(notification interface{}) { if !s.peersSub { return } - note, _ := notification.(peerNotification) method = "server.peers.subscribe" params = []string{note.address, note.port} @@ -364,16 +361,15 @@ func (sm *sessionManager) hashXSubscribe(sess *session, hashX []byte, original s } func (sm *sessionManager) doNotify(notification interface{}) { - switch notification.(type) { + switch note := notification.(type) { case internal.HeightHash: // The HeightHash notification translates to headerNotification. - notification = &headerNotification{HeightHash: notification.(internal.HeightHash)} + notification = &headerNotification{HeightHash: note} } sm.sessionsMut.RLock() var subsCopy sessionMap - switch notification.(type) { + switch note := notification.(type) { case headerNotification: - note, _ := notification.(headerNotification) subsCopy = sm.headerSubs if len(subsCopy) > 0 { hdr := [HEADER_SIZE]byte{} @@ -382,7 +378,6 @@ func (sm *sessionManager) doNotify(notification interface{}) { note.blockHeaderStr = hex.EncodeToString(note.BlockHeader[:]) } case hashXNotification: - note, _ := notification.(hashXNotification) hashXSubs, ok := sm.hashXSubs[note.hashX] if ok { subsCopy = hashXSubs @@ -410,8 +405,10 @@ type sessionServerCodec struct { // ReadRequestHeader provides ability to rewrite the incoming // request "method" field. For example: -// blockchain.block.get_header -> blockchain.block.Get_header -// blockchain.address.listunspent -> blockchain.address.Listunspent +// +// blockchain.block.get_header -> blockchain.block.Get_header +// blockchain.address.listunspent -> blockchain.address.Listunspent +// // This makes the "method" string compatible with rpc.Server // requirements. func (c *sessionServerCodec) ReadRequestHeader(req *rpc.Request) error {