triedb/pathdb: fix swapped want/got args in journal-root mismatch error (ethereum#35067)

Pablosinyores · web-flow · commit 0ef867b292ea · 2026-05-29T08:38:04.000+08:00
diff --git a/triedb/pathdb/journal.go b/triedb/pathdb/journal.go
@@ -92,7 +92,7 @@ func (db *Database) loadJournal(diskRoot common.Hash) (layer, error) {
 	// The journal is not matched with persistent state, discard them.
 	// It can happen that geth crashes without persisting the journal.
 	if !bytes.Equal(root.Bytes(), diskRoot.Bytes()) {
-		return nil, fmt.Errorf("%w want %x got %x", errUnmatchedJournal, root, diskRoot)
+		return nil, fmt.Errorf("%w want %x got %x", errUnmatchedJournal, diskRoot, root)
 	}
 	// Load the disk layer from the journal
 	base, err := db.loadDiskLayer(r)

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (db *Database) loadJournal(diskRoot common.Hash) (layer, error) {`
`92`	`92`	`// The journal is not matched with persistent state, discard them.`
`93`	`93`	`// It can happen that geth crashes without persisting the journal.`
`94`	`94`	`if !bytes.Equal(root.Bytes(), diskRoot.Bytes()) {`
`95`		`- return nil, fmt.Errorf("%w want %x got %x", errUnmatchedJournal, root, diskRoot)`
	`95`	`+ return nil, fmt.Errorf("%w want %x got %x", errUnmatchedJournal, diskRoot, root)`
`96`	`96`	`}`
`97`	`97`	`// Load the disk layer from the journal`
`98`	`98`	`base, err := db.loadDiskLayer(r)`