Page MenuHomePhabricator
Differential D12440

TestLockPointValidity to txmempool
ClosedPublic
Actions

Authored by PiRK on Nov 9 2022, 06:32.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABCbd99a74d3edc: TestLockPointValidity to txmempool
Summary

This is a partial backport of core#22677 and core#23649
https://github.com/bitcoin/bitcoin/pull/22677/commits/1b3a11e126b258fba975ed7c452221608f2c5472
https://github.com/bitcoin/bitcoin/pull/23649/commits/ddd74ff65c471c5c25815ac0643d16ea0d51f58f

Depends on D12442

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.Nov 9 2022, 06:32
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 9 2022, 06:32
PiRK requested review of this revision.Nov 9 2022, 06:32
teamcity edited the summary of this revision. (Show Details)Nov 9 2022, 06:32
Harbormaster completed remote builds in B20835: Diff 36179.Nov 9 2022, 06:34
teamcity added a comment.Nov 9 2022, 06:34
Build Bitcoin ABC Diffs / Diff Testing (build-clang) failed.

Tail of the build log:

[352/524] Linking C executable src/secp256k1/sign-bench
[353/524] Installing component secp256k1
-- Install configuration: "RelWithDebInfo"
-- Install component: "secp256k1"
-- Installing: /results/artifacts/lib/libsecp256k1.a
-- Installing: /results/artifacts/include/secp256k1.h
-- Installing: /results/artifacts/include/secp256k1_preallocated.h
-- Installing: /results/artifacts/include/secp256k1_recovery.h
-- Installing: /results/artifacts/include/secp256k1_schnorr.h
[354/524] Linking C executable src/secp256k1/internal-bench
[355/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[356/524] Building CXX object src/CMakeFiles/server.dir/rpc/mining.cpp.o
[357/524] Building CXX object src/CMakeFiles/server.dir/rpc/avalanche.cpp.o
[358/524] Building CXX object src/CMakeFiles/server.dir/txorphanage.cpp.o
[359/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[360/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[361/524] Building CXX object src/CMakeFiles/server.dir/rpc/net.cpp.o
[362/524] Building CXX object src/CMakeFiles/server.dir/torcontrol.cpp.o
[363/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[364/524] Building CXX object src/CMakeFiles/bitcoin-cli.dir/bitcoin-cli.cpp.o
[365/524] Linking CXX executable src/bitcoin-cli
[366/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[367/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[368/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/context.cpp.o
[369/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[370/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[371/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/net.cpp.o
[372/524] Building CXX object src/CMakeFiles/server.dir/wallet/init.cpp.o
[373/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
[374/524] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[375/524] Linking CXX executable src/bitcoin-tx
[376/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[377/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/bdb.cpp.o
[378/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[379/524] Building CXX object src/CMakeFiles/server.dir/rpc/blockchain.cpp.o
[380/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[381/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[382/524] Building CXX object src/CMakeFiles/server.dir/rpc/rawtransaction.cpp.o
[383/524] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/db.cpp.o
[384/524] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/dns.cpp.o
[385/524] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[386/524] Building CXX object src/CMakeFiles/server.dir/net_processing.cpp.o
[387/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[388/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/sqlite.cpp.o
[389/524] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/options.cpp.o
[390/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/salvage.cpp.o
[391/524] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[392/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[393/524] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/bitcoin.cpp.o
[394/524] Building CXX object src/CMakeFiles/server.dir/validation.cpp.o
[395/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[396/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[397/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[398/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
[399/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[400/524] Linking CXX static library src/wallet/libwallet.a
[401/524] Linking CXX static library src/wallet/libwallet-tool.a
[402/524] Linking CXX executable src/bitcoin-wallet
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang failed with exit code 1
PiRK added a child revision: D12441: remove unnecessary casts, use braced initialization and add an assertion.Nov 9 2022, 06:41
PiRK planned changes to this revision.Nov 9 2022, 07:08

weird cs_main lock annotation error (looks like a false positive, as there was no change in locks)

PiRK mentioned this in D12442: add missing lock assertion to removeForReorg.Nov 9 2022, 09:03
PiRK updated this revision to Diff 36182.Nov 9 2022, 09:06
PiRK edited the summary of this revision. (Show Details)
PiRK added a parent revision: D12442: add missing lock assertion to removeForReorg.

rebase and add dependency on D12442

Harbormaster completed remote builds in B20838: Diff 36182.Nov 9 2022, 09:09
teamcity added a comment.Nov 9 2022, 09:09
Build Bitcoin ABC Diffs / Diff Testing (build-clang) failed.

Tail of the build log:

[352/524] Building C object src/secp256k1/CMakeFiles/internal-bench.dir/src/bench_internal.c.o
[353/524] Installing component secp256k1
-- Install configuration: "RelWithDebInfo"
-- Install component: "secp256k1"
-- Installing: /results/artifacts/lib/libsecp256k1.a
-- Installing: /results/artifacts/include/secp256k1.h
-- Installing: /results/artifacts/include/secp256k1_preallocated.h
-- Installing: /results/artifacts/include/secp256k1_recovery.h
-- Installing: /results/artifacts/include/secp256k1_schnorr.h
[354/524] Linking C executable src/secp256k1/internal-bench
[355/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[356/524] Building CXX object src/CMakeFiles/server.dir/net.cpp.o
[357/524] Building CXX object src/CMakeFiles/server.dir/txorphanage.cpp.o
[358/524] Building CXX object src/CMakeFiles/server.dir/rpc/avalanche.cpp.o
[359/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[360/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[361/524] Building CXX object src/CMakeFiles/server.dir/torcontrol.cpp.o
[362/524] Building CXX object src/CMakeFiles/server.dir/rpc/net.cpp.o
[363/524] Building CXX object src/CMakeFiles/bitcoin-cli.dir/bitcoin-cli.cpp.o
[364/524] Linking CXX executable src/bitcoin-cli
[365/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[366/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[367/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[368/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/context.cpp.o
[369/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[370/524] Building CXX object src/CMakeFiles/server.dir/wallet/init.cpp.o
[371/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[372/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/net.cpp.o
[373/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
[374/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[375/524] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[376/524] Linking CXX executable src/bitcoin-tx
[377/524] Building CXX object src/CMakeFiles/server.dir/rpc/blockchain.cpp.o
[378/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/bdb.cpp.o
[379/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[380/524] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[381/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[382/524] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[383/524] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/db.cpp.o
[384/524] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/dns.cpp.o
[385/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[386/524] Building CXX object src/CMakeFiles/server.dir/rpc/rawtransaction.cpp.o
[387/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/sqlite.cpp.o
[388/524] Building CXX object src/CMakeFiles/server.dir/net_processing.cpp.o
[389/524] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/options.cpp.o
[390/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/salvage.cpp.o
[391/524] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[392/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[393/524] Building CXX object src/CMakeFiles/server.dir/validation.cpp.o
[394/524] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/bitcoin.cpp.o
[395/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[396/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[397/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[398/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
[399/524] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[400/524] Linking CXX static library src/wallet/libwallet.a
[401/524] Linking CXX static library src/wallet/libwallet-tool.a
[402/524] Linking CXX executable src/bitcoin-wallet
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang failed with exit code 1
PiRK planned changes to this revision.Nov 9 2022, 09:16
PiRK updated this revision to Diff 36187.Nov 9 2022, 10:17

fix constness of &active_chain parameter in function definition, make it match the function declaration.

Harbormaster completed remote builds in B20841: Diff 36187.Nov 9 2022, 10:29
teamcity added a comment.Nov 9 2022, 10:29
Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.

Failed tests logs:

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

------- Stdout: -------
2022-11-09T10:20:01.469000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20221109_101855/abc_p2p_avalanche_proof_voting_12
2022-11-09T10:20:03.846000Z TestFramework (INFO): Trigger polling from the node...
2022-11-09T10:20:04.052000Z TestFramework (INFO): Check we poll for valid proof
2022-11-09T10:20:04.321000Z TestFramework (INFO): Check we don't poll for subsequent proofs if the cooldown is not elapsed, proof not the favorite
2022-11-09T10:20:04.371000Z TestFramework (INFO): Check we don't poll for subsequent proofs if the cooldown is not elapsed, proof is the favorite
2022-11-09T10:20:04.422000Z TestFramework (INFO): Check we poll for conflicting proof if the proof is not the favorite
2022-11-09T10:20:04.544000Z TestFramework (INFO): Check we poll for conflicting proof if the proof is the favorite
2022-11-09T10:21:04.602000Z TestFramework.utils (ERROR): wait_until() failed. Predicate: ''''
        self.wait_until(lambda: self.can_find_proof_in_poll(proofid, response))
'''
2022-11-09T10:21:04.603000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 132, in main
    self.run_test()
  File "/work/test/functional/abc_p2p_avalanche_proof_voting.py", line 117, in run_test
    self.poll_tests(node)
  File "/work/test/functional/abc_p2p_avalanche_proof_voting.py", line 168, in poll_tests
    self.send_and_check_for_polling(peer, proof_seq40)
  File "/work/test/functional/abc_p2p_avalanche_proof_voting.py", line 97, in send_and_check_for_polling
    self.wait_until(lambda: self.can_find_proof_in_poll(proofid, response))
  File "/work/test/functional/test_framework/test_framework.py", line 671, in wait_until
    return wait_until_helper(test_function, timeout=timeout,
  File "/work/test/functional/test_framework/util.py", line 285, in wait_until_helper
    raise AssertionError(
AssertionError: Predicate ''''
        self.wait_until(lambda: self.can_find_proof_in_poll(proofid, response))
''' not true after 60.0 seconds
2022-11-09T10:21:04.655000Z TestFramework (INFO): Stopping nodes
2022-11-09T10:21:04.757000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20221109_101855/abc_p2p_avalanche_proof_voting_12
2022-11-09T10:21:04.757000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20221109_101855/abc_p2p_avalanche_proof_voting_12/test_framework.log
2022-11-09T10:21:04.757000Z TestFramework (ERROR): 
2022-11-09T10:21:04.758000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-diff/test/tmp/test_runner_₿₵_  _20221109_101855/abc_p2p_avalanche_proof_voting_12' to consolidate all logs
2022-11-09T10:21:04.758000Z TestFramework (ERROR): 
2022-11-09T10:21:04.758000Z 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-09T10:21:04.759000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2022-11-09T10:21:04.759000Z TestFramework (ERROR):

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

PiRK updated this revision to Diff 36200.Nov 9 2022, 15:59

rebase for unrelated CI failure

Harbormaster completed remote builds in B20853: Diff 36200.Nov 9 2022, 16:22
Fabien accepted this revision.Nov 9 2022, 17:28
This revision is now accepted and ready to land.Nov 9 2022, 17:28
Closed by commit rABCbd99a74d3edc: TestLockPointValidity to txmempool (authored by glozow <gloriajzhao@gmail.com>, committed by PiRK). · Explain WhyNov 10 2022, 08:50
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABCbd99a74d3edc: TestLockPointValidity to txmempool.

Revision Contents
Changeset List

PathSize
src/
8 lines
19 lines
7 lines
19 lines

Diff 36215

View Options

src/txmempool.h

Loading...
View Options

src/txmempool.cpp

Loading...
View Options

src/validation.h

Loading...
View Options

src/validation.cpp

Loading...