logs(service/headers): improve logging for exchange

celestiaorg · Nov 19, 2021 · 4a1be85 · 4a1be85
1 parent 14dfb05
commit 4a1be85
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/service/header/core_exchange.go b/service/header/core_exchange.go
@@ -30,6 +30,7 @@ func NewCoreExchange(fetcher *core.BlockFetcher, dag format.DAGService) *CoreExc
 }
 
 func (ce *CoreExchange) RequestHeader(ctx context.Context, height uint64) (*ExtendedHeader, error) {
+	log.Debugw("core: requesting header", "height", height)
 	intHeight := int64(height) + 1
 	block, err := ce.fetcher.GetBlock(ctx, &intHeight)
 	if err != nil {
@@ -38,10 +39,11 @@ func (ce *CoreExchange) RequestHeader(ctx context.Context, height uint64) (*Exte
 	return ce.generateExtendedHeaderFromBlock(block)
 }
 
-func (ce *CoreExchange) RequestHeaders(ctx context.Context, origin, amount uint64) ([]*ExtendedHeader, error) {
+func (ce *CoreExchange) RequestHeaders(ctx context.Context, from, amount uint64) ([]*ExtendedHeader, error) {
+	log.Debugw("core: requesting headers", "from", from, "to", from+amount)
 	headers := make([]*ExtendedHeader, amount)
 	for i := range headers {
-		extHeader, err := ce.RequestHeader(ctx, origin+uint64(i))
+		extHeader, err := ce.RequestHeader(ctx, from+uint64(i))
 		if err != nil {
 			return nil, err
 		}
@@ -53,6 +55,7 @@ func (ce *CoreExchange) RequestHeaders(ctx context.Context, origin, amount uint6
 }
 
 func (ce *CoreExchange) RequestByHash(ctx context.Context, hash tmbytes.HexBytes) (*ExtendedHeader, error) {
+	log.Debugw("core: requesting header", "hash", hash.String())
 	block, err := ce.fetcher.GetBlockByHash(ctx, hash)
 	if err != nil {
 		return nil, err
@@ -61,6 +64,7 @@ func (ce *CoreExchange) RequestByHash(ctx context.Context, hash tmbytes.HexBytes
 }
 
 func (ce *CoreExchange) RequestHead(ctx context.Context) (*ExtendedHeader, error) {
+	log.Debug("core: requesting head")
 	chainHead, err := ce.fetcher.GetBlock(ctx, nil)
 	if err != nil {
 		return nil, err

diff --git a/service/header/p2p_exchange.go b/service/header/p2p_exchange.go
@@ -149,7 +149,7 @@ func (ex *P2PExchange) handleRequest(from, to uint64, stream network.Stream) {
 }
 
 func (ex *P2PExchange) RequestHead(ctx context.Context) (*ExtendedHeader, error) {
-	log.Debug("requesting head")
+	log.Debug("p2p: requesting head")
 	// create request
 	req := &pb.ExtendedHeaderRequest{
 		Origin: uint64(0),
@@ -163,7 +163,7 @@ func (ex *P2PExchange) RequestHead(ctx context.Context) (*ExtendedHeader, error)
 }
 
 func (ex *P2PExchange) RequestHeader(ctx context.Context, height uint64) (*ExtendedHeader, error) {
-	log.Debugw("requesting header", "height", height)
+	log.Debugw("p2p: requesting header", "height", height)
 	// sanity check height
 	if height == 0 {
 		return nil, fmt.Errorf("specified request height must be greater than 0")
@@ -181,7 +181,7 @@ func (ex *P2PExchange) RequestHeader(ctx context.Context, height uint64) (*Exten
 }
 
 func (ex *P2PExchange) RequestHeaders(ctx context.Context, from, amount uint64) ([]*ExtendedHeader, error) {
-	log.Debugw("requesting headers", "from", from, "to", from+amount)
+	log.Debugw("p2p: requesting headers", "from", from, "to", from+amount)
 	// create request
 	req := &pb.ExtendedHeaderRequest{
 		Origin: from,
@@ -191,7 +191,7 @@ func (ex *P2PExchange) RequestHeaders(ctx context.Context, from, amount uint64)
 }
 
 func (ex *P2PExchange) RequestByHash(ctx context.Context, hash tmbytes.HexBytes) (*ExtendedHeader, error) {
-	log.Debugw("requesting header", "hash", hash.String())
+	log.Debugw("p2p: requesting header", "hash", hash.String())
 	// create request
 	req := &pb.ExtendedHeaderRequest{
 		Hash:   hash.Bytes(),