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

orderwatch: Avoid conflicting txn error when updating block headers in DB #614

Merged
merged 12 commits into from Jan 10, 2020

Conversation

@fabioberger
Copy link
Contributor

fabioberger commented Dec 28, 2019

No description provided.

@fabioberger fabioberger changed the title debug: Conflicting txn error [WIP] debug: Conflicting txn error Dec 28, 2019
@fabioberger fabioberger closed this Jan 2, 2020
@fabioberger fabioberger reopened this Jan 3, 2020
@fabioberger fabioberger changed the title [WIP] debug: Conflicting txn error orderwatch: Avoid conflicting txn error when updating block headers in DB Jan 3, 2020
@fabioberger fabioberger requested a review from albrow Jan 3, 2020
@fabioberger fabioberger force-pushed the fix/conflictingOperations branch from 6f34478 to 1d2ddfe Jan 3, 2020
@fabioberger fabioberger requested a review from jalextowle Jan 4, 2020
Copy link
Member

albrow left a comment

Just two small suggestions.

db/transaction.go Outdated Show resolved Hide resolved
zeroex/orderwatch/order_watcher.go Outdated Show resolved Hide resolved
@albrow

This comment has been minimized.

Copy link
Member

albrow commented Jan 8, 2020

@fabioberger can we also add a regression test here? Or at the very least add a test for updateBlockHeadersStoredInDB?

@fabioberger

This comment has been minimized.

Copy link
Contributor Author

fabioberger commented Jan 8, 2020

Added comprehensive tests for updateBlockHeadersStoredInDB

zeroex/orderwatch/order_watcher.go Outdated Show resolved Hide resolved
zeroex/orderwatch/order_watcher_test.go Outdated Show resolved Hide resolved
Copy link
Contributor

jalextowle left a comment

Looks good to me (once @albrow's comments have been addressed)! This is an interesting issue

@fabioberger fabioberger force-pushed the fix/conflictingOperations branch 2 times, most recently from cec121d to 66092b4 Jan 9, 2020
zeroex/orderwatch/order_watcher_test.go Outdated Show resolved Hide resolved
@fabioberger fabioberger force-pushed the fix/conflictingOperations branch from 360c207 to 3ffcd1b Jan 10, 2020
@albrow albrow self-requested a review Jan 10, 2020
@albrow
albrow approved these changes Jan 10, 2020
@fabioberger fabioberger merged commit 82d161f into development Jan 10, 2020
2 checks passed
2 checks passed
ci/circleci: build Your tests passed on CircleCI!
Details
continuous-integration/drone/push Build is passing
Details
@fabioberger fabioberger deleted the fix/conflictingOperations branch Jan 10, 2020
@fabioberger fabioberger self-assigned this Jan 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.