forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

triedb/pathdb: restore pathdb journal version

Browse source
This commit is contained in:
Gary Rong 2024-03-07 09:31:08 +08:00
parent aadcb88675
commit a82472e24c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
triedb/pathdb/database_test.go
View file

@ -543,7 +543,7 @@ func TestCorruptedJournal(t *testing.T) {
// Mutate the journal in disk, it should be regarded as invalid // Mutate the journal in disk, it should be regarded as invalid
blob := rawdb.ReadTrieJournal(tester.db.diskdb) blob := rawdb.ReadTrieJournal(tester.db.diskdb)
blob[0] = 0xa blob[0] = 0x1
rawdb.WriteTrieJournal(tester.db.diskdb, blob) rawdb.WriteTrieJournal(tester.db.diskdb, blob)
// Verify states, all not-yet-written states should be discarded // Verify states, all not-yet-written states should be discarded

4
triedb/pathdb/journal.go
View file

@ -46,8 +46,7 @@ var (
// Changelog: // Changelog:
// //
// - Version 0: initial version // - Version 0: initial version
// - Version 1: storage.Incomplete field is removed const journalVersion uint64 = 0
const journalVersion uint64 = 1
// journalNode represents a trie node persisted in the journal. // journalNode represents a trie node persisted in the journal.
type journalNode struct { type journalNode struct {
@ -70,6 +69,7 @@ type journalAccounts struct {
// journalStorage represents a list of storage slots belong to an account. // journalStorage represents a list of storage slots belong to an account.
type journalStorage struct { type journalStorage struct {
Incomplete bool // Deprecated, keep it for backward compatibility
Account common.Address Account common.Address
Hashes []common.Hash Hashes []common.Hash
Slots [][]byte Slots [][]byte