8000 net: Address outstanding review comments from PR20721 by jnewbery · Pull Request #21198 · bitcoin/bitcoin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

net: Address outstanding review comments from PR20721 #21198

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.

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

Merged
merged 1 commit into from
Apr 1, 2021

Conversation

jnewbery
Copy link
Contributor
@jnewbery jnewbery commented Feb 16, 2021

@jnewbery
Copy link
Contributor Author
jnewbery commented Feb 16, 2021

Thanks for reviewing #20721 @ajtowns @amitiuttarwar @MarcoFalke. Here are your suggested changes.

I've marked as draft for now and will rebase on main once #21015 is merged so I can take @MarcoFalke's suggestion here: #20721 (comment).

EDIT: That suggestion was taken in #21015, which has now been merged.

@jnewbery jnewbery force-pushed the 2021-02-20721-followups branch 2 times, most recently from 3589baa to ae12c65 Compare February 17, 2021 20:40
@jnewbery jnewbery force-pushed the 2021-02-20721-followups branch 2 times, most recently from 240ff15 to 57d0224 Compare February 22, 2021 08:45
@jnewbery
Copy link
Contributor Author

Rebased on master to pick up fix for interface_zmq.py in #21008.

@DrahtBot
Copy link
Contributor
DrahtBot commented Mar 4, 2021

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with 8000 the following ones:

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@jnewbery
Copy link
Contributor Author

Rebased and moved out of draft.

@jnewbery jnewbery marked this pull request as ready for review March 30, 2021 09:52
@jnewbery jnewbery changed the title [net] Address outstanding review comments from PR20721 net: Address outstanding review comments from PR20721 Mar 30, 2021
@DrahtBot
Copy link
Contributor
DrahtBot commented Apr 1, 2021

🐙 This pull request conflicts with the target branch and needs rebase.

Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".

- rename to ShouldRunInactivityChecks (bitcoin#20721 (comment))
- take optional time now (bitcoin#20721 (comment))
- call from within InactivityChecks (bitcoin#20721 (comment))
- update comment (bitcoin#20721 (comment))
- change ordering of inequality (bitcoin#20721 (comment))
@jnewbery
Copy link
Contributor Author
jnewbery commented Apr 1, 2021

Rebased

@jnewbery jnewbery force-pushed the 2021-02-20721-followups branch from caa4a3f to 5ed535a Compare April 1, 2021 10:35
@laanwj
Copy link
Member
laanwj commented Apr 1, 2021

Code review ACK 5ed535a

@laanwj laanwj merged commit 086226d into bitcoin:master Apr 1, 2021
@jnewbery jnewbery deleted the 2021-02-20721-followups branch April 1, 2021 14:39
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 1, 2021
…20721

5ed535a [net] Changes to RunInactivityChecks (John Newbery)

Pull request description:

  Updates the RunInactivityChecks() function:

  - rename to ShouldRunInactivityChecks (bitcoin#20721 (comment))
  - take optional time now (bitcoin#20721 (comment))
  - call from within InactivityChecks (bitcoin#20721 (comment))
  - update comment (bitcoin#20721 (comment))
  - change ordering of inequality (bitcoin#20721 (comment))
  - ~make inline (bitcoin#20721 (comment)

ACKs for top commit:
  laanwj:
    Code review ACK 5ed535a

Tree-SHA512: e6ac8e8cce5cddc84a52a40c908634c25f58be74512d642840d7bd7fa65c3d90a0f46cc19e4865b3fae7c933138247f58356167a60a5c519305cfd6d05e51f51
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Feb 2, 2022
Summary:
- rename to ShouldRunInactivityChecks
- take optional time now
- call from within InactivityChecks
- update comment
- change ordering of inequality

This is a backport of [[bitcoin/bitcoin#21198 | core#21198]]

Depends on D10954

Test Plan: `ninja all check-all`

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D10955
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0