Page MenuHomePhabricator

scripted-diff: Rename touched member variables
ClosedPublic

Authored by PiRK on Nov 16 2022, 16:39.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC15a33f9e067a: scripted-diff: Rename touched member variables
Summary
-BEGIN VERIFY SCRIPT-

 ren() { sed -i "s/\<$1\>/$2/g" $( git grep -l "$1" ./src/ ) ; }

 ren vinfoBlockFile     m_blockfile_info
 ren nLastBlockFile     m_last_blockfile
 ren fCheckForPruning   m_check_for_pruning
 ren setDirtyBlockIndex m_dirty_blockindex
 ren setDirtyFileInfo   m_dirty_fileinfo

-END VERIFY SCRIPT-

This concludes backport of core#23974
https://github.com/bitcoin/bitcoin/pull/23974/commits/fa68a6c2fc6754c160e0f98007785602201b3c47

Depends on D12517

Test Plan

ninja all check-all

Event Timeline

PiRK requested review of this revision.Nov 16 2022, 16:39

Failed tests logs:

====== Bitcoin ABC functional tests: abc_p2p_getavaaddr.py ======

------- Stdout: -------
2022-11-16T17:03:08.887000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20221116_170235/abc_p2p_getavaaddr_6
2022-11-16T17:03:18.357000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 133, in main
    self.run_test()
  File "/work/test/functional/abc_p2p_getavaaddr.py", line 505, in run_test
    self.getavaaddr_interval_test()
  File "/work/test/functional/abc_p2p_getavaaddr.py", line 149, in getavaaddr_interval_test
    requester.send_message(msg_getavaaddr())
  File "/usr/lib/python3.9/contextlib.py", line 124, in __exit__
    next(self.gen)
  File "/work/test/functional/test_framework/test_node.py", line 532, in assert_debug_log
    self._raise_assertion_error(
  File "/work/test/functional/test_framework/test_node.py", line 212, in _raise_assertion_error
    raise AssertionError(self._node_msg(msg))
AssertionError: [node 0] Expected messages "['Ignoring repeated getavaaddr from peer']" does not partially match log:

 - 2022-11-16T17:03:16.306928Z (mocktime: 2022-11-16T17:03:09Z) [../../src/net_processing.cpp:3456] [ProcessMessage] received: avaresponse (653 bytes) peer=2
 - 2022-11-16T17:03:16.307173Z (mocktime: 2022-11-16T17:03:09Z) [../../src/net_processing.cpp:3456] [ProcessMessage] received: avaresponse (653 bytes) peer=4
 - 2022-11-16T17:03:16.307356Z (mocktime: 2022-11-16T17:03:09Z) [../../src/net_processing.cpp:3456] [ProcessMessage] received: avaresponse (653 bytes) peer=0
 - 2022-11-16T17:03:16.307534Z (mocktime: 2022-11-16T17:03:09Z) [../../src/net.cpp:3504] [PushMessage] sending avapoll (585 bytes) peer=2
 - 2022-11-16T17:03:16.307685Z (mocktime: 2022-11-16T17:03:09Z) [../../src/net_processing.cpp:3456] [ProcessMessage] received: avaresponse (653 bytes) peer=7
 - 2022-11-16T17:03:16.317673Z (mocktime: 2022-11-16T17:03:09Z) [../../src/net.cpp:3504] [PushMessage] sending avapoll (585 bytes) peer=4
 - 2022-11-16T17:03:16.337898Z (mocktime: 2022-11-16T17:03:09Z) [../../src/net.cpp:3504] [PushMessage] sending avapoll (585 bytes) peer=7
 - 2022-11-16T17:03:16.348056Z (mocktime: 2022-11-16T17:03:09Z) [../../src/net.cpp:3504] [PushMessage] sending avapoll (585 bytes) peer=0


2022-11-16T17:03:19.690000Z TestFramework (INFO): Stopping nodes
2022-11-16T17:03:19.942000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20221116_170235/abc_p2p_getavaaddr_6
2022-11-16T17:03:19.942000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20221116_170235/abc_p2p_getavaaddr_6/test_framework.log
2022-11-16T17:03:19.942000Z TestFramework (ERROR): 
2022-11-16T17:03:19.943000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20221116_170235/abc_p2p_getavaaddr_6' to consolidate all logs
2022-11-16T17:03:19.943000Z TestFramework (ERROR): 
2022-11-16T17:03:19.943000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2022-11-16T17:03:19.943000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2022-11-16T17:03:19.943000Z TestFramework (ERROR):

Each failure log is accessible here:
Bitcoin ABC functional tests: abc_p2p_getavaaddr.py

Fabien added a subscriber: Fabien.
Fabien added inline comments.
src/validation.cpp
5777

I suppose m_dirty_blockindex becomes private with an insert like method at some point ?

This revision is now accepted and ready to land.Nov 17 2022, 08:54
src/validation.cpp
5777

It is already private, but for now it is still exposed to friends (CChainState & CChainstateManager) as of today in Bitcoin Core.

This revision was landed with ongoing or failed builds.Nov 17 2022, 10:07
This revision was automatically updated to reflect the committed changes.