Skip to content

Merge master back to develop#3154

Merged
ebuchman merged 3 commits intodevelopfrom
master
Jan 18, 2019
Merged

Merge master back to develop#3154
ebuchman merged 3 commits intodevelopfrom
master

Conversation

@ebuchman
Copy link
Contributor

  • Updated all relevant documentation in docs
  • Updated all code comments where relevant
  • Wrote tests
  • Updated CHANGELOG_PENDING.md

* consensus: createProposalBlock function

* blockExecutor.CreateProposalBlock

- factored out of consensus pkg into a method on blockExec
- new private interfaces for mempool ("txNotifier") and evpool with one function each
- consensus tests still require more mempool methods

* failing test for CreateProposalBlock

* Fix bug in include evidece into block

* evidence: change maxBytes to maxSize

* MaxEvidencePerBlock

- changed to return both the max number and the max bytes
- preparation for #2590

* changelog

* fix linter

* Fix from review

Co-Authored-By: ebuchman <ethan@coinculture.info>
@ebuchman ebuchman requested a review from melekes as a code owner January 18, 2019 17:39
@ebuchman ebuchman merged commit d17969e into develop Jan 18, 2019
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.

1 participant