Skip to content

Conversation

@jtimon
Copy link
Contributor

@jtimon jtimon commented Oct 10, 2018

This is a backport of bitcoin/bitcoin#13311 since it's already merged, merging this in elements-0.17 should at least make the next rebase slightly easier. And since we're heavily touching chainparams in elements, I think it's a good thing.

@jtimon jtimon changed the title E17 regtest only params Don't edit Chainparams after initialization Oct 10, 2018
@stevenroose
Copy link
Contributor

Were you supposed to have the release notes commit there as well?

@jtimon
Copy link
Contributor Author

jtimon commented Oct 10, 2018 via email

@stevenroose
Copy link
Contributor

tACK 36e1447

@instagibbs
Copy link
Contributor

the release notes change is noise, please remove

@instagibbs
Copy link
Contributor

also it's building the apple image in travis? Didn't think we had that active.

@instagibbs
Copy link
Contributor

oh of course this is 0.17. We should disable that build.

@instagibbs instagibbs changed the title Don't edit Chainparams after initialization [0.17] Don't edit Chainparams after initialization Oct 12, 2018
@jtimon jtimon force-pushed the e17-regtest-only-params branch from 36e1447 to 06f1b42 Compare October 12, 2018 18:53
@jtimon
Copy link
Contributor Author

jtimon commented Oct 12, 2018

Removed release notes commit.

@jtimon jtimon merged commit 06f1b42 into ElementsProject:elements-0.17 Oct 13, 2018
jtimon added a commit that referenced this pull request Oct 13, 2018
06f1b42 Don't edit Chainparams after initialization (Jorge Timón)
875a47c MOVEONLY: Move versionbits info out of versionbits.o (Jorge Timón)

Pull request description:

  This is a backport of bitcoin/bitcoin#13311 since it's already merged, merging this in elements-0.17 should at least make the next rebase slightly easier. And since we're heavily touching chainparams in elements, I think it's a good thing.

Tree-SHA512: 177f6396a34ecf87b609b39a108cc2b1e5b49bd8d12b705a4ae0241c7a5007db754ff01d6d045ee1e6a219ec6c6767663cd98558752c83961c4aff3378aef5a2
@jtimon jtimon deleted the e17-regtest-only-params branch October 13, 2018 01:31
instagibbs added a commit that referenced this pull request Oct 16, 2018
… tests

a1e0c56 QA: Use resgtest2 chain instead of regtest for rpc tests (Jorge Timón)
4454c52 QA: Adapt BitcoinTestFramework for chains other than "regtest" (Jorge Timón)
a06be15 Testchains: Introduce custom chain whose constructor... (Jorge Timón)
46749eb Testchains: Qt: Simplify network/chain styles and add a default purple (Jorge Timón)
c0c1e38 Testchains: Generic selection with -chain=<str> in addition of -testnet and -regtest (Jorge Timón)
56515c3 9102: Really don't validate genesis block (Gregory Sanders)

Pull request description:

  Backport of bitcoin/bitcoin#8994

  The tests seem to pass with:

  ```
  python3 ./test/functional/test_runner.py -j4 --extended
  ```

  Let's please try to keep all general review things on bitcoin/bitcoin#8994 and elements-specific things here.

  Dependencies:

  - [x] [0.17] Don't edit Chainparams after initialization #427
  - [x] [0.17] Test: Fix example_test.py #434

Tree-SHA512: e216587b6f9d3a462372915e01c8eb3c65a61e4ea29f398e65a7fc03a3ea5676c4711527b5cc2c115893591e7cd5b0ecd2f1fac4faf7ef747a022e2657bc99d4
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.

3 participants