Merge pull request #6210 from filecoin-project/fix/repeat-append

fix: repeat append value
filecoin-project · Nov 7, 2023 · 0c62864 · 0c62864
2 parents 36e6176 + bc969f0
commit 0c62864
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/app/submodule/eth/eth_api.go b/app/submodule/eth/eth_api.go
@@ -715,7 +715,6 @@ func (a *ethAPI) EthFeeHistory(ctx context.Context, p jsonrpc.RawParams) (types.
 
 		// arrays should be reversed at the end
 		baseFeeArray = append(baseFeeArray, types.EthBigInt(basefee))
-		gasUsedRatioArray = append(gasUsedRatioArray, float64(totalGasUsed)/float64(constants.BlockGasLimit))
 		gasUsedRatioArray = append(gasUsedRatioArray, float64(totalGasUsed)/float64(maxGas))
 
 		rewardsArray = append(rewardsArray, rewards)

diff --git a/pkg/fork/fork.go b/pkg/fork/fork.go
@@ -647,8 +647,10 @@ func (c *ChainFork) HandleStateForks(ctx context.Context, root cid.Cid, height a
 		if err == nil && ok && !constants.NoMigrationResultCache {
 			log.Infow("CACHED migration", "height", height, "from", root, "to", migCid)
 			return migCid, nil
-		} else if err != nil {
+		} else if !errors.Is(err, dstore.ErrNotFound) {
 			log.Errorw("failed to lookup previous migration result", "err", err)
+		} else {
+			log.Debug("no cached migration found, migrating from scratch")
 		}
 
 		startTime := time.Now()

diff --git a/pkg/net/exchange/server.go b/pkg/net/exchange/server.go
@@ -70,7 +70,7 @@ func (s *server) handleStream(stream inet.Stream) {
 		exchangeServerLog.Warnf("failed to read block sync request: %s", err)
 		return
 	}
-	exchangeServerLog.Infow("block sync request", "start", req.Head, "len", req.Length, "remote peer", stream.Conn().RemotePeer())
+	exchangeServerLog.Debugw("block sync request", "start", req.Head, "len", req.Length, "remote peer", stream.Conn().RemotePeer())
 
 	resp, err := s.processRequest(ctx, &req)
 	if err != nil {

diff --git a/venus-component/libp2p/exchange/server.go b/venus-component/libp2p/exchange/server.go
@@ -113,7 +113,7 @@ func (s *Server) HandleStream(stream inet.Stream) {
 		return
 	}
 
-	slog.Infow("block sync request", "start", req.Head, "len", req.Length)
+	slog.Debugw("block sync request", "start", req.Head, "len", req.Length)
 
 	resp, err := s.processRequest(ctx, &req)
 	if err != nil {