Page MenuHomePhabricator

[net processing] Remove CNode::nServices
ClosedPublic

Authored by PiRK on Nov 7 2023, 12:24.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC3c955cd36ead: [net processing] Remove CNode::nServices
Summary

Use Peer::m_their_services instead

This is a partial backport of core#25514
https://github.com/bitcoin/bitcoin/pull/25514/commits/d9079fe18dc5d81ce290876353555b51125127d1

Depends on D14747

Test Plan

ninja all check-all

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

PiRK requested review of this revision.Nov 7 2023, 12:24
PiRK planned changes to this revision.Nov 7 2023, 12:26
PiRK added inline comments.
src/net.h
286 ↗(On Diff #42976)

rebase issue

This revision is now accepted and ready to land.Nov 8 2023, 09:34
This revision was automatically updated to reflect the committed changes.

Tail of the build log:

CPack: - Install directory: /work/doc
CPack: - Install project: bitcoin-abc []
CPack: Create package
CPack: - package: /work/abc-ci-builds/build-win64/bitcoin-abc-0.28.3-x86_64-w64-mingw32.exe generated.
CPack: Create package using ZIP
CPack: Install projects
CPack: - Install directory: /work/doc
CPack: - Install project: bitcoin-abc []
CPack: Create package
CPack: - package: /work/abc-ci-builds/build-win64/bitcoin-abc-0.28.3-x86_64-w64-mingw32.zip generated.
wine: created the configuration directory '/root/.wine'
002c:fixme:actctx:parse_depend_manifests Could not find dependent assembly L"Microsoft.Windows.Common-Controls" (6.0.0.0)
002c:fixme:winediag:loader_init wine-staging 8.19 is a testing version containing experimental patches.
002c:fixme:winediag:loader_init Please mention your exact version when filing bug reports on winehq.org.
004c:fixme:actctx:parse_depend_manifests Could not find dependent assembly L"Microsoft.Windows.Common-Controls" (6.0.0.0)
0054:fixme:actctx:parse_depend_manifests Could not find dependent assembly L"Microsoft.Windows.Common-Controls" (6.0.0.0)
0054:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0054:err:winediag:nodrv_CreateWindow L"The explorer process failed to start."
0054:err:systray:initialize_systray Could not create tray window
0054:err:ole:StdMarshalImpl_MarshalInterface Failed to create ifstub, hr 0x80004002
0054:err:ole:CoMarshalInterface Failed to marshal the interface {6d5140c1-7436-11ce-8034-00aa006009fa}, hr 0x80004002
0054:err:ole:apartment_get_local_server_stream Failed: 0x80004002
0044:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0044:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
004c:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
004c:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
004c:err:ole:apartment_createwindowifneeded CreateWindow failed with error 3
004c:err:ole:apartment_createwindowifneeded CreateWindow failed with error 0
004c:err:ole:apartment_createwindowifneeded CreateWindow failed with error 14007
004c:err:ole:StdMarshalImpl_MarshalInterface Failed to create ifstub, hr 0x800736b7
004c:err:ole:CoMarshalInterface Failed to marshal the interface {6d5140c1-7436-11ce-8034-00aa006009fa}, hr 0x800736b7
004c:err:ole:apartment_get_local_server_stream Failed: 0x800736b7
004c:err:ole:start_rpcss Failed to open RpcSs service
002c:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
002c:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
007c:err:ntoskrnl:ServiceMain Failed to load L"C:\\windows\\system32\\win32k.sys"
007c:err:ntoskrnl:ServiceMain Failed to load L"C:\\windows\\system32\\drivers\\dxgkrnl.sys"
007c:err:ntoskrnl:ServiceMain Failed to load L"C:\\windows\\system32\\drivers\\dxgmms1.sys"
0094:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0094:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
009c:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
009c:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
00e4:fixme:msg:pack_message msg 14 (WM_ERASEBKGND) not supported yet
00e4:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
00e4:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
010c:fixme:hid:handle_IRP_MN_QUERY_ID Unhandled type 00000005
010c:fixme:hid:handle_IRP_MN_QUERY_ID Unhandled type 00000005
010c:fixme:hid:handle_IRP_MN_QUERY_ID Unhandled type 00000005
010c:fixme:hid:handle_IRP_MN_QUERY_ID Unhandled type 00000005
wine: configuration in L"/root/.wine" has been updated.
0134:fixme:winspool:PerfOpen (null): stub
0134:fixme:winspool:PerfCollect L"Global", 00007FFFFE2FEA98, 00007FFFFE2FEA7C, 00007FFFFE2FEA80: stub
0134:fixme:winspool:PerfClose stub
Running 582 test cases...
0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0134:fixme:file:NtLockFile I/O completion on lock not implemented yet
007c:fixme:mountmgr:harddisk_ioctl Unsupported ioctl 90064 (device=9 access=0 func=19 method=0)
0  007c:fixme:mountmgr:harddisk_ioctl Unsupported ioctl 90064 (device=9 access=0 func=19 method=0)
0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  Assertion failed: nPreferredDownload == 0, file ../../src/net_processing.cpp, line 1997

Build build-win64 failed with exit code 3