Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch for concurrent iterator & others #383

Merged
merged 2 commits into from
May 18, 2023
Merged

Conversation

roysc
Copy link

@roysc roysc commented May 16, 2023

Passes a constructor function instead of the actual Trie, so we can use this with the alt Trie implementation,
and adds some other random patches:

  • replace new(trie.Trie)
  • reduce debug noise
  • patch postgres config - add driver, rename DefaultConfig => TestConfig

replace new(trie.Trie)

reduce debug noise

patch postgres config - add driver, rename DefaultConfig => TestConfig
@roysc roysc requested a review from i-norden May 16, 2023 09:32
This allows us to use our alt trie implementation
Copy link
Collaborator

@i-norden i-norden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, please open a PR cherry-picking this and targeting it to the v1.11.6-statediff-v5 branch too

testBlock1 = types.NewBlock(&header1, nil, nil, nil, new(trie.Trie))
testBlock2 = types.NewBlock(&header2, nil, nil, nil, new(trie.Trie))
testBlock3 = types.NewBlock(&header3, nil, nil, nil, new(trie.Trie))
testBlock1 = types.NewBlock(&header1, nil, nil, nil, trie.NewEmpty(nil))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thought I had already gotten rid of these,new(trie.Trie) can cause panics on subsequent calls to the trie

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this was actually from of a prior commit of yours, that must have gotten lost somewhere in rebase-land

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants