Differential D10873

[net processing] Add Peer& arg to MaybeDiscourageAndDisconnect()
ClosedPublic
Actions

Authored by Fabien on Jan 24 2022, 20:15.

Details

Reviewers

PiRK

Group Reviewers

Restricted Project

Maniphest Tasks

Restricted Maniphest Task

Commits

rABCa021be3353aa: [net processing] Add Peer& arg to MaybeDiscourageAndDisconnect()

Summary

Refactor only. No change in behaviour.

Partial backport of core#20721:
https://github.com/bitcoin/bitcoin/pull/20721/commits/f8b3058992b507f3a6aac9d4e2db00102ae1b197

Ref T1696.

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

Fabien created this revision.Jan 24 2022, 20:15

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 24 2022, 20:15

Fabien requested review of this revision.Jan 24 2022, 20:15

teamcity edited the summary of this revision. (Show Details)Jan 24 2022, 20:16

Harbormaster completed remote builds in B17981: Diff 31921.Jan 24 2022, 20:37

Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.

Tail of the build log:

[0m[0;32mwallet_abandonconflict.py                 | ✓ Passed  | 19 s
[0m[0;32mwallet_address_types.py                   | ✓ Passed  | 15 s
[0m[0;32mwallet_address_types.py --descriptors     | ✓ Passed  | 9 s
[0m[0;32mwallet_avoidreuse.py                      | ✓ Passed  | 4 s
[0m[0;32mwallet_avoidreuse.py --descriptors        | ✓ Passed  | 4 s
[0m[0;32mwallet_backup.py                          | ✓ Passed  | 33 s
[0m[0;32mwallet_balance.py                         | ✓ Passed  | 13 s
[0m[0;32mwallet_balance.py --descriptors           | ✓ Passed  | 28 s
[0m[0;32mwallet_basic.py                           | ✓ Passed  | 24 s
[0m[0;32mwallet_coinbase_category.py               | ✓ Passed  | 1 s
[0m[0;32mwallet_create_tx.py                       | ✓ Passed  | 6 s
[0m[0;32mwallet_createwallet.py                    | ✓ Passed  | 2 s
[0m[0;32mwallet_createwallet.py --descriptors      | ✓ Passed  | 2 s
[0m[0;32mwallet_createwallet.py --usecli           | ✓ Passed  | 2 s
[0m[0;32mwallet_descriptor.py                      | ✓ Passed  | 6 s
[0m[0;32mwallet_disable.py                         | ✓ Passed  | 1 s
[0m[0;32mwallet_dump.py                            | ✓ Passed  | 4 s
[0m[0;32mwallet_encryption.py                      | ✓ Passed  | 5 s
[0m[0;32mwallet_encryption.py --descriptors        | ✓ Passed  | 5 s
[0m[0;32mwallet_hd.py                              | ✓ Passed  | 6 s
[0m[0;32mwallet_hd.py --descriptors                | ✓ Passed  | 5 s
[0m[0;32mwallet_import_rescan.py                   | ✓ Passed  | 5 s
[0m[0;32mwallet_import_with_label.py               | ✓ Passed  | 1 s
[0m[0;32mwallet_importdescriptors.py               | ✓ Passed  | 6 s
[0m[0;32mwallet_importmulti.py                     | ✓ Passed  | 3 s
[0m[0;32mwallet_importprunedfunds.py               | ✓ Passed  | 2 s
[0m[0;32mwallet_importprunedfunds.py --descriptors | ✓ Passed  | 2 s
[0m[0;32mwallet_keypool.py                         | ✓ Passed  | 3 s
[0m[0;32mwallet_keypool_topup.py                   | ✓ Passed  | 2 s
[0m[0;32mwallet_keypool_topup.py --descriptors     | ✓ Passed  | 2 s
[0m[0;32mwallet_labels.py                          | ✓ Passed  | 2 s
[0m[0;32mwallet_labels.py --descriptors            | ✓ Passed  | 2 s
[0m[0;32mwallet_listreceivedby.py                  | ✓ Passed  | 13 s
[0m[0;32mwallet_listsinceblock.py                  | ✓ Passed  | 5 s
[0m[0;32mwallet_listsinceblock.py --descriptors    | ✓ Passed  | 8 s
[0m[0;32mwallet_listtransactions.py                | ✓ Passed  | 5 s
[0m[0;32mwallet_listtransactions.py --descriptors  | ✓ Passed  | 4 s
[0m[0;32mwallet_multiwallet.py                     | ✓ Passed  | 44 s
[0m[0;32mwallet_multiwallet.py --usecli            | ✓ Passed  | 12 s
[0m[0;32mwallet_reorgsrestore.py                   | ✓ Passed  | 3 s
[0m[0;32mwallet_resendwallettransactions.py        | ✓ Passed  | 3 s
[0m[0;32mwallet_send.py                            | ✓ Passed  | 6 s
[0m[0;32mwallet_startup.py                         | ✓ Passed  | 2 s
[0m[0;32mwallet_txn_clone.py                       | ✓ Passed  | 2 s
[0m[0;32mwallet_txn_clone.py --mineblock           | ✓ Passed  | 3 s
[0m[0;32mwallet_txn_doublespend.py                 | ✓ Passed  | 1 s
[0m[0;32mwallet_txn_doublespend.py --mineblock     | ✓ Passed  | 3 s
[0m[0;32mwallet_watchonly.py                       | ✓ Passed  | 1 s
[0m[0;32mwallet_watchonly.py --usecli              | ✓ Passed  | 1 s
[0m[1m
ALL                                       | ✓ Passed  | 1190 s (accumulated) 
[0mRuntime: 238 s

----------------------------------------------------------------------
Ran 10 tests in 0.093s

OK

ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1

Unrelated build failure, restarting

Fabien added a child revision: D10875: [net] Add RunInactivityChecks().Jan 24 2022, 20:58

Missing dependency, needs rebase

Rebase

Harbormaster completed remote builds in B18005: Diff 31958.Jan 25 2022, 15:34

PiRK accepted this revision.Jan 25 2022, 15:45

This revision is now accepted and ready to land.Jan 25 2022, 15:45

Closed by commit rABCa021be3353aa: [net processing] Add Peer& arg to MaybeDiscourageAndDisconnect() (authored by John Newbery <john@johnnewbery.com>, committed by Fabien). · Explain WhyJan 25 2022, 16:38

This revision was automatically updated to reflect the committed changes.

Fabien added a commit: rABCa021be3353aa: [net processing] Add Peer& arg to MaybeDiscourageAndDisconnect().