core: fix DeleteTrieJournal params

bnb-chain · Apr 11, 2024 · af15ebf · af15ebf
1 parent 8d8c061
commit af15ebf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/triedb/pathdb/database.go b/triedb/pathdb/database.go
@@ -318,7 +318,7 @@ func (db *Database) Enable(root common.Hash) error {
 	// Drop the stale state journal in persistent database and
 	// reset the persistent state id back to zero.
 	batch := db.diskdb.NewBatch()
-	db.DeleteTrieJournal()
+	db.DeleteTrieJournal(batch)
 	rawdb.WritePersistentStateID(batch, 0)
 	if err := batch.Write(); err != nil {
 		return err
@@ -382,7 +382,7 @@ func (db *Database) Recover(root common.Hash, loader triestate.TrieLoader) error
 		// disk layer won't be accessible from outside.
 		db.tree.reset(dl)
 	}
-	db.DeleteTrieJournal()
+	db.DeleteTrieJournal(db.diskdb)
 	_, err := truncateFromHead(db.diskdb, db.freezer, dl.stateID())
 	if err != nil {
 		return err
@@ -527,10 +527,10 @@ func (db *Database) GetAllRooHash() [][]string {
 	return data
 }
 
-func (db *Database) DeleteTrieJournal() error {
+func (db *Database) DeleteTrieJournal(writer ethdb.KeyValueWriter) error {
 	filePath := db.config.JournalFilePath
 	if len(filePath) == 0 {
-		rawdb.DeleteTrieJournal(db.diskdb)
+		rawdb.DeleteTrieJournal(writer)
 	} else {
 		_, err := os.Stat(filePath)
 		if os.IsNotExist(err) {

diff --git a/triedb/pathdb/journal.go b/triedb/pathdb/journal.go
@@ -93,6 +93,7 @@ type JournalFileWriter struct {
 type JournalFileReader struct {
 	file *os.File
 }
+
 type JournalKVWriter struct {
 	journalBuf bytes.Buffer
 	diskdb     ethdb.Database
@@ -563,7 +564,7 @@ func (db *Database) Journal(root common.Hash) error {
 		return errDatabaseReadOnly
 	}
 	// Firstly write out the metadata of journal
-	db.DeleteTrieJournal()
+	db.DeleteTrieJournal(db.diskdb)
 	journal := newJournalWriter(db.config.JournalFilePath, db.diskdb)
 	defer journal.Close()
 
@@ -584,7 +585,6 @@ func (db *Database) Journal(root common.Hash) error {
 	if err := l.journal(journal); err != nil {
 		return err
 	}
-
 	// Store the journal into the database and return
 	journalSize := journal.Size()