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

JSON fix #714

Merged
merged 3 commits into from
Mar 19, 2018
Merged

JSON fix #714

merged 3 commits into from
Mar 19, 2018

Conversation

pmconrad
Copy link
Contributor

@pmconrad pmconrad commented Mar 11, 2018 •
edited
Loading

At this time this is just a placeholder PR for bitshares/bitshares-fc#15 . Do not merge yet!

Fixes wrong placeholders in egenesis.

FC bump still missing.

abitmore
abitmore previously approved these changes Mar 11, 2018
View reviewed changes
@abitmore abitmore mentioned this pull request Mar 17, 2018
Merged
@pmconrad
Copy link
Contributor Author

Adapted core to new variant conversion infrastructure, requires bitshares/bitshares-fc#21

@pmconrad pmconrad dismissed abitmore’s stale review March 18, 2018 12:38

Obsolete, please review new commits as well

@abitmore abitmore self-assigned this Mar 18, 2018
abitmore
abitmore approved these changes Mar 18, 2018
View reviewed changes
Copy link
Member

@abitmore abitmore 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.

@abitmore
Copy link
Member

Please solve conflicts.

@abitmore abitmore removed their assignment Mar 18, 2018
@pmconrad
Copy link
Contributor Author

rebased on current develop

@abitmore
Copy link
Member

Thank you @pmconrad. Looks fine. Lets get #723 ready then merge these two PR's at same time.

@abitmore
Copy link
Member

With all the changes, including this PR and #723, replay statistics on my machine:

542364ms th_a db_management.cpp:59 reindex ] reindexing blockchain
542364ms th_a db_management.cpp:65 reindex ] Replaying blocks, starting at 1...
3078982ms th_a db_management.cpp:78 reindex ] Writing database to disk at block 25361758
3087067ms th_a db_management.cpp:80 reindex ] Done
3102586ms th_a db_management.cpp:122 reindex ] Done reindexing, elapsed time: 6160.22179700000015146 sec

Earlier statistics data is 25186907 blocks / 5987 seconds, mentioned here: bitshares/bitshares-fc#20 (comment).

Conclusion: the fix doesn't significantly affect performance.

@abitmore abitmore merged commit 08b16dd into bitshares:develop Mar 19, 2018
@pmconrad pmconrad deleted the json_fix branch June 22, 2018 13:24
@oxarbitrage oxarbitrage mentioned this pull request Aug 9, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abitmore abitmore abitmore approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
201803 Non-Consensus-Changing Release
Development

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