Skip to content

add CheckAndDial to avoid duplicate code#13146

Merged
mslipper merged 6 commits intoethereum-optimism:developfrom
zhiqiangxu:add_CheckAndDial
Dec 6, 2024
Merged

add CheckAndDial to avoid duplicate code#13146
mslipper merged 6 commits intoethereum-optimism:developfrom
zhiqiangxu:add_CheckAndDial

Conversation

@zhiqiangxu
Copy link
Copy Markdown
Contributor

@zhiqiangxu zhiqiangxu commented Nov 30, 2024

This PR extracts the common code to CheckAndDial to avoid duplicate code, and slips in a handy log for loadBlocksIntoState.

@zhiqiangxu zhiqiangxu requested a review from a team as a code owner November 30, 2024 04:14
@zhiqiangxu zhiqiangxu requested a review from a team as a code owner November 30, 2024 04:35
Copy link
Copy Markdown
Contributor

@protolambda protolambda left a comment

Choose a reason for hiding this comment

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

LGTM, just one tiny bugfix. Will apply it and run CI, then ready to approve and merge if the fix looks good to you too.

@protolambda
Copy link
Copy Markdown
Contributor

Hmm, it looks like the start part in the batcher changed in the base branch, and is a merge conflict.

@zhiqiangxu
Copy link
Copy Markdown
Contributor Author

Hmm, it looks like the start part in the batcher changed in the base branch, and is a merge conflict.

Conflict is resolved.

@mslipper
Copy link
Copy Markdown
Contributor

mslipper commented Dec 6, 2024

/ci authorize 079ef70

@mslipper mslipper enabled auto-merge December 6, 2024 16:59
@mslipper
Copy link
Copy Markdown
Contributor

mslipper commented Dec 6, 2024

/ci authorize dd3039e

@mslipper mslipper added this pull request to the merge queue Dec 6, 2024
Merged via the queue into ethereum-optimism:develop with commit d949564 Dec 6, 2024
sigma pushed a commit that referenced this pull request Dec 19, 2024
* Don't repeat yourself

* add a log for loadBlocksIntoState

* op-batcher: fix log in batcher/driver.go

* modify log

---------

Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
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.

3 participants