Remove blockchain object from some tests (#1612)

core/rawdb/accessors_chain.go

@@ -223,14 +223,22 @@ func ReadHeader(db databaseReader, hash common.Hash, number uint64) *types.Heade
 	return header
 }
 
-func ReadCurrentHeader(db databaseReader) *types.Header {
-	headHash := ReadHeadBlockHash(db)
+func ReadCurrentHeader(db ethdb.Getter) *types.Header {
+	headHash := ReadHeadHeaderHash(db)
 	headNumber := ReadHeaderNumber(db, headHash)
 	if headNumber == nil {
 		return nil
 	}
 	return ReadHeader(db, headHash, *headNumber)
 }
+func ReadCurrentBlock(db ethdb.Getter) *types.Block {
+	headHash := ReadHeadBlockHash(db)
+	headNumber := ReadHeaderNumber(db, headHash)
+	if headNumber == nil {
+		return nil
+	}
+	return ReadBlock(db, headHash, *headNumber)
+}
 
 // ReadHeadersByNumber retrieves all the block header corresponding to the number.
 func ReadHeadersByNumber(db ethdb.Getter, number uint64) ([]*types.Header, error) {
@@ -486,6 +494,14 @@ func ReadTd(db databaseReader, hash common.Hash, number uint64) (*big.Int, error
 	return td, nil
 }
 
+func ReadTdByHash(db ethdb.Getter, hash common.Hash) (*big.Int, error) {
+	headNumber := ReadHeaderNumber(db, hash)
+	if headNumber == nil {
+		return nil, nil
+	}
+	return ReadTd(db, hash, *headNumber)
+}
+
 // WriteTd stores the total difficulty of a block into the database.
 func WriteTd(db DatabaseWriter, hash common.Hash, number uint64, td *big.Int) error {
 	data, err := rlp.EncodeToBytes(td)

eth/stagedsync/stage_headers.go

@@ -260,7 +260,6 @@ Error: %v
 	}
 	if newCanonical {
 		encoded := dbutils.EncodeBlockNumber(lastHeader.Number.Uint64())
-
 		if err := batch.Put(dbutils.HeaderNumberBucket, lastHeader.Hash().Bytes(), encoded); err != nil {
 			return false, false, 0, fmt.Errorf("[%s] failed to store hash to number mapping: %w", logPrefix, err)
 		}