diff --git a/cmd/util/cmd/find-trie-root/cmd.go b/cmd/util/cmd/find-trie-root/cmd.go index b07225c16fd..e39960c8e65 100644 --- a/cmd/util/cmd/find-trie-root/cmd.go +++ b/cmd/util/cmd/find-trie-root/cmd.go @@ -190,7 +190,7 @@ func searchRootHashInSegments( for reader.Next() { record := reader.Record() - operation, _, update, err := wal.Decode(record) + operation, rootHash, _, err := wal.Decode(record) if err != nil { return 0, 0, fmt.Errorf("cannot decode LedgerWAL record: %w", err) } @@ -201,7 +201,7 @@ func searchRootHashInSegments( switch operation { case wal.WALUpdate: - rootHash := update.RootHash + // rootHash := update.RootHash lg.Debug(). Str("root-hash", rootHash.String()). diff --git a/ledger/complete/wal/encoding.go b/ledger/complete/wal/encoding.go index dce4f084f93..7e560d8f8fb 100644 --- a/ledger/complete/wal/encoding.go +++ b/ledger/complete/wal/encoding.go @@ -65,6 +65,7 @@ func Decode(data []byte) (operation WALOperation, rootHash ledger.RootHash, upda switch operation { case WALUpdate: update, err = ledger.DecodeTrieUpdate(data[1:]) + rootHash = update.RootHash return case WALDelete: var rootHashBytes []byte diff --git a/ledger/complete/wal/encoding_test.go b/ledger/complete/wal/encoding_test.go index 6580d0a683f..648c9ecd2be 100644 --- a/ledger/complete/wal/encoding_test.go +++ b/ledger/complete/wal/encoding_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/require" "github.com/onflow/flow-go/ledger" - "github.com/onflow/flow-go/ledger/common/hash" "github.com/onflow/flow-go/ledger/common/testutils" realWAL "github.com/onflow/flow-go/ledger/complete/wal" ) @@ -44,7 +43,8 @@ func TestUpdate(t *testing.T) { operation, stateCommitment, up, err := realWAL.Decode(data) require.NoError(t, err) assert.Equal(t, realWAL.WALUpdate, operation) - assert.Equal(t, stateCommitment, ledger.RootHash(hash.DummyHash)) + // assert.Equal(t, stateCommitment, ledger.RootHash(hash.DummyHash)) + assert.Equal(t, stateCommitment, rootHash) assert.Equal(t, update, up) }) }