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.

Sign up for GitHub

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

Jump to bottom

Fix bidding #1830

Merged
merged 3 commits into from
Aug 20, 2019
Merged

Fix bidding #1830

merged 3 commits into from
Aug 20, 2019

Conversation

pmconrad
Copy link
Contributor

Fixes #1692

@pmconrad pmconrad changed the base branch from master to hardfork June 24, 2019 16:01
@pmconrad pmconrad added the 2d Developing Status indicating currently designing and developing a solution label Jun 24, 2019
@pmconrad pmconrad removed the 2d Developing Status indicating currently designing and developing a solution label Jun 24, 2019
@jmjatlanta
Copy link
Contributor

Looks good. Being that the current code is more restrictive than this change, I assume we can remove the "else" after the hardfork. Do you concur?

@pmconrad
Copy link
Contributor Author

I assume we can remove the "else" after the hardfork

The else remains necessary when !_bid, i. e. this is an initial bid not an update.

jmjatlanta
jmjatlanta suggested changes Aug 3, 2019
View reviewed changes
Copy link
Contributor

@jmjatlanta jmjatlanta left a comment

Choose a reason for hiding this comment

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

Looks good. Tests look complete. Fixes issue. Tested on ubuntu 18.04 / OpenSSL 1.1 / Boost 1.69.
Just a few formatting issues.

libraries/chain/market_evaluator.cpp Outdated Show resolved Hide resolved
tests/tests/swan_tests.cpp Outdated Show resolved Hide resolved
@pmconrad pmconrad requested a review from jmjatlanta August 20, 2019 14:22
jmjatlanta
jmjatlanta approved these changes Aug 20, 2019
View reviewed changes
Copy link
Contributor

@jmjatlanta jmjatlanta left a comment

Choose a reason for hiding this comment

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

Code looks good. Tested on Ubuntu 18.04. chain_test reports no errors. Thanks!

@pmconrad pmconrad merged commit 6afe618 into bitshares:hardfork Aug 20, 2019
@pmconrad pmconrad deleted the 1692_fix_bidding branch August 20, 2019 17:55
@pmconrad pmconrad mentioned this pull request Sep 4, 2019
Closed
17 tasks
@MichelSantos MichelSantos mentioned this pull request Oct 18, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abitmore abitmore abitmore left review comments

@jmjatlanta jmjatlanta jmjatlanta approved these changes

Assignees
No one assigned
Labels
hardfork
Projects
None yet
Milestone
4.0.0 - Protocol Upgrade Release
Development

Successfully merging this pull request may close these issues.
3 participants
@pmconrad @jmjatlanta @abitmore