This is just shorter and more readable. There is no change in behavior.
Depends on D10355.
Ref T1854.
Details
Details
- Reviewers
PiRK deadalnix - Group Reviewers
Restricted Project - Maniphest Tasks
- Restricted Maniphest Task
- Commits
- rABC4df517ddfb86: [avalanche] Introduce ProofRef as an alias for std::shared_ptr<Proof>
ninja all check-all
Should return a single occurrence (the definition):
git grep "std::shared_ptr<Proof>"
Should return no occurrence:
git grep "std::shared_ptr<avalanche::Proof>"
Diff Detail
Diff Detail
- Repository
- rABC Bitcoin ABC
- Branch
- avalanche_proofref
- Lint
Lint Passed - Unit
No Test Coverage - Build Status
Buildable 17032 Build 33898: Build Diff lint-circular-dependencies · build-without-wallet · build-diff · build-debug · build-clang-tidy · build-clang Build 33897: arc lint + arc unit
Event Timeline
Comment Actions
Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.
Tail of the build log:
[0m[0;32mrpc_signrawtransaction.py | ✓ Passed | 2 s [0m[0;32mrpc_txoutproof.py | ✓ Passed | 1 s [0m[0;32mrpc_uptime.py | ✓ Passed | 1 s [0m[0;32mrpc_users.py | ✓ Passed | 5 s [0m[0;32mrpc_whitelist.py | ✓ Passed | 1 s [0m[0;32mtool_wallet.py | ✓ Passed | 4 s [0m[0;32mwallet_abandonconflict.py | ✓ Passed | 17 s [0m[0;32mwallet_address_types.py | ✓ Passed | 13 s [0m[0;32mwallet_avoidreuse.py | ✓ Passed | 4 s [0m[0;32mwallet_avoidreuse.py --descriptors | ✓ Passed | 4 s [0m[0;32mwallet_backup.py | ✓ Passed | 25 s [0m[0;32mwallet_balance.py | ✓ Passed | 22 s [0m[0;32mwallet_basic.py | ✓ Passed | 18 s [0m[0;32mwallet_coinbase_category.py | ✓ Passed | 1 s [0m[0;32mwallet_create_tx.py | ✓ Passed | 5 s [0m[0;32mwallet_createwallet.py | ✓ Passed | 2 s [0m[0;32mwallet_createwallet.py --usecli | ✓ Passed | 3 s [0m[0;32mwallet_descriptor.py | ✓ Passed | 5 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 | 4 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_keypool.py | ✓ Passed | 3 s [0m[0;32mwallet_keypool_topup.py | ✓ Passed | 2 s [0m[0;32mwallet_keypool_topup.py --descriptors | ✓ Passed | 3 s [0m[0;32mwallet_labels.py | ✓ Passed | 1 s [0m[0;32mwallet_labels.py --descriptors | ✓ Passed | 2 s [0m[0;32mwallet_listreceivedby.py | ✓ Passed | 10 s [0m[0;32mwallet_listsinceblock.py | ✓ Passed | 5 s [0m[0;32mwallet_listtransactions.py | ✓ Passed | 20 s [0m[0;32mwallet_multiwallet.py | ✓ Passed | 39 s [0m[0;32mwallet_multiwallet.py --usecli | ✓ Passed | 11 s [0m[0;32mwallet_reorgsrestore.py | ✓ Passed | 3 s [0m[0;32mwallet_resendwallettransactions.py | ✓ Passed | 4 s [0m[0;32mwallet_send.py | ✓ Passed | 7 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 | 1030 s (accumulated) [0mRuntime: 211 s ---------------------------------------------------------------------- Ran 9 tests in 0.093s OK ninja: build stopped: cannot make progress due to previous errors. Build build-diff failed with exit code 1
| src/avalanche/proof.h | ||
|---|---|---|
| 156 ↗ | (On Diff #30536) | CTransactionRef references a const CTransaction, is there a reason not to do the same here? |
| src/avalanche/test/peermanager_tests.cpp | ||
| 177 ↗ | (On Diff #30536) | If you make the type more opaque, then wrap this as well. This code makes no sense in the current state of affair, because it pretends to abstract away the use of the shared_ptr but doesn't in this case. |
| src/avalanche/proof.h | ||
|---|---|---|
| 156 ↗ | (On Diff #30536) | Yes, there is one spot that needs a small update for that to work (in the processor factory we pass the peer data proof as a reference to be initialized from the -avaproof hex string). This will better be done in a follow-up |
| src/avalanche/proofcomparator.h | ||
| 18 ↗ | (On Diff #30536) | This one deserves to be renamed as well |
| src/avalanche/test/peermanager_tests.cpp | ||
| 177 ↗ | (On Diff #30536) | I should just remove this one and update buildRandomProof to return a shared pointer, since most of the API uses that. Will do in another diff. |
Comment Actions
Rebase on top of D10349 (removed the getRandomProofPtr() wrapper), rename ProofSharedPointerComparator to ProofRefComparator
Comment Actions
Build Bitcoin ABC Diffs / Diff Testing (build-clang) failed.
Tail of the build log:
[385/455] Running utility command for check-bitcoin-txvalidationcache_tests [386/455] Running utility command for check-bitcoin-finalization_tests [387/455] bitcoin: testing merkleblock_tests [388/455] bitcoin: testing op_reversebytes_tests [389/455] Running utility command for check-bitcoin-merkleblock_tests [390/455] bitcoin: testing scheduler_tests [391/455] Running utility command for check-bitcoin-op_reversebytes_tests [392/455] bitcoin: testing bip32_tests [393/455] Running utility command for check-bitcoin-scheduler_tests [394/455] Running utility command for check-bitcoin-bip32_tests [395/455] bitcoin: testing sync_tests [396/455] Running utility command for check-bitcoin-sync_tests [397/455] bitcoin: testing torcontrol_tests [398/455] bitcoin: testing transaction_tests [399/455] Running utility command for check-bitcoin-torcontrol_tests [400/455] bitcoin: testing settings_tests [401/455] Running utility command for check-bitcoin-transaction_tests [402/455] Running utility command for check-bitcoin-settings_tests [403/455] bitcoin: testing streams_tests [404/455] bitcoin: testing timedata_tests [405/455] Running utility command for check-bitcoin-streams_tests [406/455] Running utility command for check-bitcoin-timedata_tests [407/455] bitcoin: testing compilerbug_tests [408/455] bitcoin: testing validation_flush_tests [409/455] bitcoin: testing blockcheck_tests [410/455] Running utility command for check-bitcoin-compilerbug_tests [411/455] Running utility command for check-bitcoin-validation_flush_tests [412/455] Running utility command for check-bitcoin-blockcheck_tests [413/455] bitcoin: testing checkpoints_tests [414/455] Running utility command for check-bitcoin-checkpoints_tests [415/455] bitcoin: testing intmath_tests [416/455] bitcoin: testing serialize_tests [417/455] bitcoin: testing schnorr_tests [418/455] Running utility command for check-bitcoin-intmath_tests [419/455] bitcoin: testing validationinterface_tests [420/455] Running utility command for check-bitcoin-serialize_tests [421/455] Running utility command for check-bitcoin-schnorr_tests [422/455] bitcoin: testing wallet_tests [423/455] Running utility command for check-bitcoin-validationinterface_tests [424/455] bitcoin: testing blockstatus_tests [425/455] bitcoin: testing cashaddr_tests [426/455] Running utility command for check-bitcoin-wallet_tests [427/455] Running utility command for check-bitcoin-blockstatus_tests [428/455] Running utility command for check-bitcoin-cashaddr_tests [429/455] bitcoin: testing versionbits_tests [430/455] Running utility command for check-bitcoin-versionbits_tests [431/455] bitcoin: testing crypto_tests [432/455] Running utility command for check-bitcoin-crypto_tests [433/455] bitcoin: testing script_tests [434/455] Running utility command for check-bitcoin-script_tests [435/455] bitcoin: testing monolith_opcodes_tests [436/455] bitcoin: testing coinselector_tests [437/455] Running utility command for check-bitcoin-monolith_opcodes_tests [438/455] Running utility command for check-bitcoin-coinselector_tests [439/455] bitcoin: testing coins_tests [440/455] Running utility command for check-bitcoin-coins_tests [441/455] Running bitcoin test suite PASSED: bitcoin test suite ninja: build stopped: cannot make progress due to previous errors. Build build-clang failed with exit code 1
Comment Actions
Build Bitcoin ABC Diffs / Diff Testing (build-clang-tidy) failed.
Tail of the build log:
[378/448] Running utility command for check-bitcoin-bip32_tests [379/448] Running utility command for check-bitcoin-txvalidationcache_tests [380/448] bitcoin: testing sync_tests [381/448] bitcoin: testing torcontrol_tests [382/448] Running utility command for check-bitcoin-sync_tests [383/448] bitcoin: testing op_reversebytes_tests [384/448] Running utility command for check-bitcoin-torcontrol_tests [385/448] Running utility command for check-bitcoin-op_reversebytes_tests [386/448] bitcoin: testing settings_tests [387/448] bitcoin: testing streams_tests [388/448] Running utility command for check-bitcoin-settings_tests [389/448] Running utility command for check-bitcoin-streams_tests [390/448] bitcoin: testing timedata_tests [391/448] Running utility command for check-bitcoin-timedata_tests [392/448] bitcoin: testing transaction_tests [393/448] bitcoin: testing serialize_tests [394/448] bitcoin: testing radix_tests [395/448] bitcoin: testing blockcheck_tests [396/448] Running utility command for check-bitcoin-transaction_tests [397/448] Running utility command for check-bitcoin-serialize_tests [398/448] Running utility command for check-bitcoin-blockcheck_tests [399/448] Running utility command for check-bitcoin-radix_tests [400/448] bitcoin: testing validation_flush_tests [401/448] Running utility command for check-bitcoin-validation_flush_tests [402/448] bitcoin: testing compilerbug_tests [403/448] bitcoin: testing schnorr_tests [404/448] Running utility command for check-bitcoin-compilerbug_tests [405/448] Running utility command for check-bitcoin-schnorr_tests [406/448] bitcoin: testing wallet_tests [407/448] bitcoin: testing checkpoints_tests [408/448] bitcoin: testing script_standard_tests [409/448] Running utility command for check-bitcoin-wallet_tests [410/448] Running utility command for check-bitcoin-checkpoints_tests [411/448] Running utility command for check-bitcoin-script_standard_tests [412/448] bitcoin: testing validationinterface_tests [413/448] Running utility command for check-bitcoin-validationinterface_tests [414/448] bitcoin: testing blockstatus_tests [415/448] bitcoin: testing cashaddr_tests [416/448] Running utility command for check-bitcoin-blockstatus_tests [417/448] Running utility command for check-bitcoin-cashaddr_tests [418/448] bitcoin: testing script_tests [419/448] bitcoin: testing crypto_tests [420/448] Running utility command for check-bitcoin-script_tests [421/448] Running utility command for check-bitcoin-crypto_tests [422/448] bitcoin: testing versionbits_tests [423/448] Running utility command for check-bitcoin-versionbits_tests [424/448] bitcoin: testing intmath_tests [425/448] bitcoin: testing util_tests [426/448] Running utility command for check-bitcoin-intmath_tests [427/448] Running utility command for check-bitcoin-util_tests [428/448] bitcoin: testing coinselector_tests [429/448] Running utility command for check-bitcoin-coinselector_tests [430/448] bitcoin: testing monolith_opcodes_tests [431/448] Running utility command for check-bitcoin-monolith_opcodes_tests [432/448] bitcoin: testing coins_tests [433/448] Running utility command for check-bitcoin-coins_tests [434/448] Running bitcoin test suite PASSED: bitcoin test suite ninja: build stopped: cannot make progress due to previous errors. Build build-clang-tidy failed with exit code 1
Comment Actions
Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) failed.
Tail of the build log:
[0m[1;30mwallet_importmulti.py | ○ Skipped | 0 s
[0m[1;30mwallet_importprunedfunds.py | ○ Skipped | 0 s
[0m[1;30mwallet_keypool.py | ○ Skipped | 0 s
[0m[1;30mwallet_keypool_topup.py | ○ Skipped | 0 s
[0m[1;30mwallet_keypool_topup.py --descriptors | ○ Skipped | 0 s
[0m[1;30mwallet_labels.py | ○ Skipped | 0 s
[0m[1;30mwallet_labels.py --descriptors | ○ Skipped | 0 s
[0m[1;30mwallet_listreceivedby.py | ○ Skipped | 0 s
[0m[1;30mwallet_listsinceblock.py | ○ Skipped | 0 s
[0m[1;30mwallet_listtransactions.py | ○ Skipped | 0 s
[0m[1;30mwallet_multiwallet.py | ○ Skipped | 0 s
[0m[1;30mwallet_multiwallet.py --usecli | ○ Skipped | 0 s
[0m[1;30mwallet_reorgsrestore.py | ○ Skipped | 0 s
[0m[1;30mwallet_resendwallettransactions.py | ○ Skipped | 0 s
[0m[1;30mwallet_send.py | ○ Skipped | 0 s
[0m[1;30mwallet_startup.py | ○ Skipped | 0 s
[0m[1;30mwallet_txn_clone.py | ○ Skipped | 0 s
[0m[1;30mwallet_txn_clone.py --mineblock | ○ Skipped | 0 s
[0m[1;30mwallet_txn_doublespend.py | ○ Skipped | 0 s
[0m[1;30mwallet_txn_doublespend.py --mineblock | ○ Skipped | 0 s
[0m[1;30mwallet_watchonly.py | ○ Skipped | 0 s
[0m[1;30mwallet_watchonly.py --usecli | ○ Skipped | 0 s
[0m[1m
ALL | ✓ Passed | 567 s (accumulated)
[0mRuntime: 114 s
----------------------------------------------------------------------
Ran 9 tests in 0.158s
OK
[151/416] Test Bitcoin RPC authentication...
...
----------------------------------------------------------------------
Ran 3 tests in 0.004s
OK
[152/416] cd /work/contrib/devtools/chainparams && /usr/bin/python3.7 ./test_make_chainparams.py
.....
----------------------------------------------------------------------
Ran 5 tests in 0.001s
OK
[160/416] Running pow test suite
PASSED: pow test suite
[174/416] Running seeder test suite
PASSED: seeder test suite
[177/416] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
[178/416] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/script_tests.cpp.o
In file included from /usr/include/boost/test/unit_test.hpp:19,
from ../../src/test/script_tests.cpp:30:
../../src/test/script_tests.cpp: In member function ‘void script_tests::script_build::test_method()’:
../../src/test/script_tests.cpp:540:22: note: variable tracking size limit exceeded with -fvar-tracking-assignments, retrying without
BOOST_AUTO_TEST_CASE(script_build) {
^~~~~~~~~~~~
[401/416] Running bitcoin test suite
PASSED: bitcoin test suite
ninja: build stopped: cannot make progress due to previous errors.
Build build-without-wallet failed with exit code 1Comment Actions
Build Bitcoin ABC Diffs / Diff Testing (build-debug) failed.
Tail of the build log:
[0m[0;32mwallet_hd.py | ✓ Passed | 8 s [0m[0;32mwallet_hd.py --descriptors | ✓ Passed | 7 s [0m[0;32mwallet_import_rescan.py | ✓ Passed | 10 s [0m[0;32mwallet_import_with_label.py | ✓ Passed | 1 s [0m[0;32mwallet_importdescriptors.py | ✓ Passed | 8 s [0m[0;32mwallet_importmulti.py | ✓ Passed | 6 s [0m[0;32mwallet_importprunedfunds.py | ✓ Passed | 2 s [0m[0;32mwallet_keypool.py | ✓ Passed | 3 s [0m[0;32mwallet_keypool_topup.py | ✓ Passed | 4 s [0m[0;32mwallet_keypool_topup.py --descriptors | ✓ Passed | 4 s [0m[0;32mwallet_labels.py | ✓ Passed | 2 s [0m[0;32mwallet_labels.py --descriptors | ✓ Passed | 2 s [0m[0;32mwallet_listreceivedby.py | ✓ Passed | 44 s [0m[0;32mwallet_listsinceblock.py | ✓ Passed | 5 s [0m[0;32mwallet_listtransactions.py | ✓ Passed | 13 s [0m[0;32mwallet_multiwallet.py | ✓ Passed | 30 s [0m[0;32mwallet_multiwallet.py --usecli | ✓ Passed | 17 s [0m[0;32mwallet_reorgsrestore.py | ✓ Passed | 5 s [0m[0;32mwallet_resendwallettransactions.py | ✓ Passed | 10 s [0m[0;32mwallet_send.py | ✓ Passed | 6 s [0m[0;32mwallet_startup.py | ✓ Passed | 3 s [0m[0;32mwallet_txn_clone.py | ✓ Passed | 3 s [0m[0;32mwallet_txn_clone.py --mineblock | ✓ Passed | 4 s [0m[0;32mwallet_txn_doublespend.py | ✓ Passed | 3 s [0m[0;32mwallet_txn_doublespend.py --mineblock | ✓ Passed | 4 s [0m[0;32mwallet_watchonly.py | ✓ Passed | 1 s [0m[0;32mwallet_watchonly.py --usecli | ✓ Passed | 2 s [0m[1m ALL | ✓ Passed | 1592 s (accumulated) [0mRuntime: 321 s ---------------------------------------------------------------------- Ran 9 tests in 0.265s OK [173/456] Test Bitcoin RPC authentication... ... ---------------------------------------------------------------------- Ran 3 tests in 0.017s OK [175/456] cd /work/contrib/devtools/chainparams && /usr/bin/python3.7 ./test_make_chainparams.py ..... ---------------------------------------------------------------------- Ran 5 tests in 0.001s OK [185/456] Running seeder test suite PASSED: seeder test suite [353/456] Running secp256k1 test suite PASSED: secp256k1 test suite [414/456] Running pow test suite PASSED: pow test suite [436/456] Running bitcoin-qt test suite PASSED: bitcoin-qt test suite [441/456] Running bitcoin test suite PASSED: bitcoin test suite ninja: build stopped: cannot make progress due to previous errors. Build build-debug failed with exit code 1
Comment Actions
Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.
Tail of the build log:
[0m[0;32mrpc_signrawtransaction.py | ✓ Passed | 1 s [0m[0;32mrpc_txoutproof.py | ✓ Passed | 1 s [0m[0;32mrpc_uptime.py | ✓ Passed | 1 s [0m[0;32mrpc_users.py | ✓ Passed | 5 s [0m[0;32mrpc_whitelist.py | ✓ Passed | 1 s [0m[0;32mtool_wallet.py | ✓ Passed | 4 s [0m[0;32mwallet_abandonconflict.py | ✓ Passed | 16 s [0m[0;32mwallet_address_types.py | ✓ Passed | 12 s [0m[0;32mwallet_avoidreuse.py | ✓ Passed | 4 s [0m[0;32mwallet_avoidreuse.py --descriptors | ✓ Passed | 5 s [0m[0;32mwallet_backup.py | ✓ Passed | 25 s [0m[0;32mwallet_balance.py | ✓ Passed | 9 s [0m[0;32mwallet_basic.py | ✓ Passed | 22 s [0m[0;32mwallet_coinbase_category.py | ✓ Passed | 1 s [0m[0;32mwallet_create_tx.py | ✓ Passed | 5 s [0m[0;32mwallet_createwallet.py | ✓ 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 | 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 | 4 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_keypool.py | ✓ Passed | 3 s [0m[0;32mwallet_keypool_topup.py | ✓ Passed | 2 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 | 29 s [0m[0;32mwallet_listsinceblock.py | ✓ Passed | 3 s [0m[0;32mwallet_listtransactions.py | ✓ Passed | 10 s [0m[0;32mwallet_multiwallet.py | ✓ Passed | 39 s [0m[0;32mwallet_multiwallet.py --usecli | ✓ Passed | 11 s [0m[0;32mwallet_reorgsrestore.py | ✓ Passed | 3 s [0m[0;32mwallet_resendwallettransactions.py | ✓ Passed | 2 s [0m[0;32mwallet_send.py | ✓ Passed | 8 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 | 974 s (accumulated) [0mRuntime: 200 s ---------------------------------------------------------------------- Ran 9 tests in 0.093s OK ninja: build stopped: cannot make progress due to previous errors. Build build-diff failed with exit code 1
Comment Actions
Despite the teamcity comments, the builds are green (see the previous comment, I fixed the issue before the CI completed the builds)
| src/avalanche/proof.h | ||
|---|---|---|
| 158 ↗ | (On Diff #30554) | I answered that above but I guess it was lost in the flood of CI messages:
|
| src/avalanche/proofcomparator.h | ||
| 18 ↗ | (On Diff #30554) | Done in D10355 |
| src/avalanche/proof.h | ||
|---|---|---|
| 158 ↗ | (On Diff #30554) | You really need to fix things first instead of doing the wrong thing and then fixing it in a subsequent patch. This is backward. |