[net] Consolidate logic around calling CAddrMan::Connected()
ClosedPublic
Actions

Authored by PiRK on Dec 20 2021, 13:13.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABC4237e75eea3b: [net] Consolidate logic around calling CAddrMan::Connected()

Summary

Currently, the logic around whether we called CAddrMan::Connected() for
a peer is spread between verack processing (where we discard inbound
peers) and FinalizeNode (where we discard misbehaving and
block-relay-only peers). Consolidate that logic to a single place.

Also remove the CNode.fCurrentlyConnected bool, which is now
redundant. We can rely on CNode.fSuccessfullyConnected, since the two
bools were only ever flipped to true in the same place.

This is a backport of core#20291 [1/2]
https://github.com/bitcoin/bitcoin/pull/20291/commits/eefe19471868ef0cdc9d32473d0b57015e7647ee

Depends on D10697

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Dec 20 2021, 13:13

Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 20 2021, 13:13

PiRK requested review of this revision.Dec 20 2021, 13:13

teamcity edited the summary of this revision. (Show Details)Dec 20 2021, 13:13

PiRK added a child revision: D10699: [addrman] Fix Connected() comment.Dec 20 2021, 13:16

PiRK edited the summary of this revision. (Show Details)Dec 20 2021, 13:17

Harbormaster completed remote builds in B17682: Diff 31466.Dec 20 2021, 13:32

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

Tail of the build log:

[0m[0;32mtool_wallet.py --descriptors              | ✓ Passed  | 2 s
[0m[0;32mwallet_abandonconflict.py                 | ✓ Passed  | 7 s
[0m[0;32mwallet_address_types.py                   | ✓ Passed  | 13 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  | 28 s
[0m[0;32mwallet_balance.py                         | ✓ Passed  | 8 s
[0m[0;32mwallet_balance.py --descriptors           | ✓ Passed  | 13 s
[0m[0;32mwallet_basic.py                           | ✓ Passed  | 26 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  | 3 s
[0m[0;32mwallet_descriptor.py                      | ✓ Passed  | 6 s
[0m[0;32mwallet_disable.py                         | ✓ Passed  | 0 s
[0m[0;32mwallet_dump.py                            | ✓ Passed  | 5 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  | 4 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  | 4 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  | 3 s
[0m[0;32mwallet_keypool_topup.py --descriptors     | ✓ Passed  | 3 s
[0m[0;32mwallet_labels.py                          | ✓ Passed  | 2 s
[0m[0;32mwallet_labels.py --descriptors            | ✓ Passed  | 2 s
[0m[0;32mwallet_listreceivedby.py                  | ✓ Passed  | 24 s
[0m[0;32mwallet_listsinceblock.py                  | ✓ Passed  | 5 s
[0m[0;32mwallet_listsinceblock.py --descriptors    | ✓ Passed  | 9 s
[0m[0;32mwallet_listtransactions.py                | ✓ Passed  | 13 s
[0m[0;32mwallet_listtransactions.py --descriptors  | ✓ Passed  | 9 s
[0m[0;32mwallet_multiwallet.py --usecli            | ✓ Passed  | 11 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  | 1018 s (accumulated) 
[0mRuntime: 209 s

----------------------------------------------------------------------
Ran 10 tests in 0.094s

OK

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

rebase (unrelated test failure)

Harbormaster completed remote builds in B17689: Diff 31477.Dec 20 2021, 15:11

Fabien accepted this revision.Dec 20 2021, 21:33

This revision is now accepted and ready to land.Dec 20 2021, 21:33

Closed by commit rABC4237e75eea3b: [net] Consolidate logic around calling CAddrMan::Connected() (authored by John Newbery <john@johnnewbery.com>, committed by PiRK). · Explain WhyDec 21 2021, 07:21

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABC4237e75eea3b: [net] Consolidate logic around calling CAddrMan::Connected().