Skip to content

[pull] master from bitcoin:master#85

Merged
pull[bot] merged 2 commits intobit-cook:masterfrom
bitcoin:master
Oct 23, 2019
Merged

[pull] master from bitcoin:master#85
pull[bot] merged 2 commits intobit-cook:masterfrom
bitcoin:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Oct 23, 2019

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

fjahr and others added 2 commits October 13, 2019 13:09
89339d1 tests: Add test for loadblock option (Fabian Jahr)

Pull request description:

  Fixes #17019

  Was initially part of #17044 but as the test got larger it made sense to split it into its own commit as suggested in #17019 .

  This is testing the `-loadblock` option by using the scripts in `contrib/linearize` to generate a `bootstrap.dat` file and starting a disconnected node with it. So it is also testing the linearize scripts which were untested before and needed to be made available for the CI environment, hence they are added to `DIST_CONTRIB` in `Makefile.am`.

ACKs for top commit:
  laanwj:
    ACK 89339d1

Tree-SHA512: aede0cd6e8b21194973f3633bc07fa2672d66a6f85dfe6a57cee2bb269a65d19ea49d5f9ed7914a173b3847c76e70257aa865f44bde170c1999d9655b4862d1c
@pull pull bot added the ⤵️ pull label Oct 23, 2019
@pull pull bot merged commit 4258fd7 into bit-cook:master Oct 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants