Skip to content

rpc: change setmocktime check to use IsMockableChain #18263

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
Merged
maflcko merged 1 commit into from
Mar 5, 2020
Merged

rpc: change setmocktime check to use IsMockableChain #18263

maflcko merged 1 commit into from
Mar 5, 2020

Conversation

@glozow
Copy link
Member

@glozow glozow commented Mar 4, 2020

Change: Update the if statement in setmocktime to use IsMockableChain chainparams function (aka m_is_mockable_chain) instead of MineBlocksOnDemand

Rationale: It's a more appropriate check for whether or not chain is in RegTest, as discussed in #18037

@glozow glozow changed the title rpc change setmocktime check to use IsMockableChain [WIP] rpc change setmocktime check to use IsMockableChain Mar 4, 2020
@glozow glozow changed the title [WIP] rpc change setmocktime check to use IsMockableChain [WIP] [rpc] change setmocktime check to use IsMockableChain Mar 4, 2020
@glozow glozow changed the title [WIP] [rpc] change setmocktime check to use IsMockableChain [WIP] rpc: change setmocktime check to use IsMockableChain Mar 4, 2020
@glozow glozow changed the title [WIP] rpc: change setmocktime check to use IsMockableChain rpc: change setmocktime check to use IsMockableChain Mar 4, 2020
@amitiuttarwar
Copy link
Contributor

amitiuttarwar commented Mar 4, 2020

ACK 4264e97b42e87ff1e103eb1f919cff4c0f56c4fe. Thanks for this follow up :)

@glozow glozow marked this pull request as ready for review March 4, 2020 23:19
maflcko
maflcko approved these changes Mar 5, 2020
View reviewed changes
Copy link
Member

@maflcko maflcko left a comment

Choose a reason for hiding this comment

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

ACK

jonatack
jonatack reviewed Mar 5, 2020
View reviewed changes
Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

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

ACK 4264e97b42e87ff1e103eb1f919cff4c0f56c4fe modulo nits

@promag
Copy link
Contributor

promag commented Mar 5, 2020

ACK 4264e97b42e87ff1e103eb1f919cff4c0f56c4fe.

@maflcko
Copy link
Member

maflcko commented Mar 5, 2020

Please squash your commits according to https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#squashing-commits

@glozow glozow force-pushed the rpc-setmocktime-check branch from e8600d9 to 2455aa5 Compare March 5, 2020 18:10
@glozow glozow requested a review from jonatack March 5, 2020 18:14
jonatack
jonatack reviewed Mar 5, 2020
View reviewed changes
Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

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

ACK 2455aa5

Thanks @gzhao408!

@maflcko
Copy link
Member

maflcko commented Mar 5, 2020

ACK 2455aa5 🙇

Show signature and timestamp

Signature:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

ACK 2455aa5d7f54befeade05795ed8f5dd89d01042a 🙇
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
pUhgEwwAgu4dpEDkq9fI71/VCr2Bo103qv80aKgiOGv1bOdUIObAQgD98Y39o8b2
lEppR8ivMCET6XZjp5AC39NRMA2YpvxAPNA9CyCIW8IdWWC1AZlbSOgXQnj4e1Ge
Rl1P3wt9GN4q8R9BiTNizD9njQVTThpM2tr0qR5eL1xMtEgbeDLzHUwUhddfXtns
g6V+6GEh5WUbtPKn7cOk8DNQhDTZrBVSugc1/8gUfZhm342cf4ztmeZHHbqyHdz1
hBdPZP/uY1d0zwajANpWEI7vXrC0P4mrbFdRW88ejOZn8nZdAREpcarWBA3+Q7Vt
T0XdTex/W/jyN8iVnXd5uQzWGa/1s8evPb67ph8HSKUGnGSZIfc+pVY2LqCtpaYN
cl/m42X1//XdeMAtq/rGVeg9/MFMqoeAUxS+9MoLaFaG1Hw/E6udfdOJ5iENYjMX
11sNgwL74TIvo0F+ws9Q2lxrca2O86AlBMjJ/AZaYRjy2KkdO5EpoWU2vp2j+ReR
d5F5+cpC
=nHWU
-----END PGP SIGNATURE-----

Timestamp of file with hash 1b061df7687ff438c7b5c195a12c2d0b089b1ff6cc7d010071513fbb19807002 -

@maflcko maflcko merged commit 96488e6 into bitcoin:master Mar 5, 2020
@MarkLTZ MarkLTZ mentioned this pull request Apr 4, 2020
Closed
@glozow glozow deleted the rpc-setmocktime-check branch May 25, 2020 20:31
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jan 5, 2021
@glozow @PiRK
[rpc] changed MineBlocksOnDemand to IsMockableChain
aa3561d 
Summary:
> Change: Update the if statement in setmocktime to use IsMockableChain chainparams function (aka m_is_mockable_chain) instead of MineBlocksOnDemand
>
> Rationale: It's a more appropriate check for whether or not chain is in RegTest, as discussed in [[bitcoin/bitcoin#18037 | PR18037]]

This is a backport of Core [[bitcoin/bitcoin#18263 | PR18263]]

Test Plan: `ninja all check-all`

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D8783
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@jonatack jonatack jonatack left review comments

@maflcko maflcko maflcko approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

RPC/REST/ZMQ

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@glozow @amitiuttarwar @promag @maflcko @jonatack @fanquake