Page MenuHomePhabricator

[avalanche] Use an ordered container for stakes in the proof builder
ClosedPublic

Authored by Fabien on Thu, Sep 9, 11:21.

Details

Reviewers
PiRK
Group Reviewers
Restricted Project
Maniphest Tasks
Restricted Maniphest Task
Commits
rABC5b58bdb0f7a1: [avalanche] Use an ordered container for stakes in the proof builder
Summary

Follow-up of D10076, this ensures the proof builder stakes are always consistent and makes the code more robust.

Ref T1676.
Depends on D10076.

Test Plan
ninja all check-all

Diff Detail

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

Event Timeline

Fabien requested review of this revision.Thu, Sep 9, 11:21

Tail of the build log:

[338/509] Building C object src/secp256k1/CMakeFiles/internal-bench.dir/src/bench_internal.c.o
[339/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[340/509] Building C object src/secp256k1/CMakeFiles/secp256k1.dir/src/secp256k1.c.o
[341/509] Linking C static library src/secp256k1/libsecp256k1.a
[342/509] Linking CXX static library src/libbitcoinconsensus.a
[343/509] Linking C executable src/secp256k1/ecmult-bench
[344/509] Building CXX object src/CMakeFiles/bitcoin-wallet.dir/bitcoin-wallet.cpp.o
[345/509] Linking C executable src/secp256k1/internal-bench
[346/509] Building CXX object src/CMakeFiles/script.dir/script/descriptor.cpp.o
[347/509] Building CXX object src/CMakeFiles/script.dir/script/signingprovider.cpp.o
[348/509] Linking C executable src/secp256k1/sign-bench
[349/509] Linking C executable src/secp256k1/recover-bench
[350/509] Linking C executable src/secp256k1/verify-bench
[351/509] Installing component secp256k1
-- Install configuration: "Debug"
-- 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
[352/509] Linking CXX static library src/libscript.a
[353/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/context.cpp.o
[354/509] Linking CXX static library src/libcommon.a
[355/509] Linking CXX shared library src/libbitcoinconsensus.so.0.24.2
[356/509] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[357/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[358/509] Linking CXX executable src/bitcoin-cli
[359/509] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[360/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[361/509] Linking CXX executable src/bitcoin-tx
[362/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[363/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
[364/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[365/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/bdb.cpp.o
[366/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/net.cpp.o
[367/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[368/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[369/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[370/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[371/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/dns.cpp.o
[372/509] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[373/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/db.cpp.o
[374/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[375/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[376/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[377/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/bitcoin.cpp.o
[378/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[379/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/salvage.cpp.o
[380/509] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[381/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[382/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[383/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[384/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
[385/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[386/509] Linking CXX static library src/wallet/libwallet.a
[387/509] Linking CXX static library src/wallet/libwallet-tool.a
[388/509] Linking CXX executable src/bitcoin-wallet
ninja: build stopped: cannot make progress due to previous errors.
Build build-debug failed with exit code 1

Tail of the build log:

-- 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
[335/509] Building CXX object src/CMakeFiles/util.dir/util/settings.cpp.o
[336/509] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/util/strencodings.cpp.o
[337/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[338/509] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/pubkey.cpp.o
[339/509] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/consensus/tx_check.cpp.o
[340/509] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/primitives/transaction.cpp.o
[341/509] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[342/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[343/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/context.cpp.o
[344/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[345/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[346/509] Building CXX object src/CMakeFiles/util.dir/util/time.cpp.o
[347/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[348/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/net.cpp.o
[349/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[350/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
[351/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[352/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[353/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[354/509] Building CXX object src/CMakeFiles/util.dir/util/system.cpp.o
[355/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/bdb.cpp.o
[356/509] Linking CXX static library src/libutil.a
[357/509] Linking CXX static library src/librpcclient.a
[358/509] Linking CXX static library src/libbitcoinconsensus.a
[359/509] Linking CXX static library src/libscript.a
[360/509] Linking CXX static library src/libcommon.a
[361/509] Linking CXX shared library src/libbitcoinconsensus.so.0.24.2
[362/509] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqabstractnotifier.cpp.o
[363/509] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[364/509] Linking CXX executable src/bitcoin-cli
[365/509] Linking CXX executable src/bitcoin-tx
[366/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[367/509] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[368/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[369/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[370/509] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqnotificationinterface.cpp.o
[371/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[372/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/dns.cpp.o
[373/509] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqpublishnotifier.cpp.o
[374/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/db.cpp.o
[375/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/salvage.cpp.o
[376/509] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqrpc.cpp.o
[377/509] Linking CXX static library src/zmq/libzmq.a
[378/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[379/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/bitcoin.cpp.o
[380/509] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[381/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[382/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[383/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[384/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[385/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
[386/509] Linking CXX static library src/wallet/libwallet.a
[387/509] Linking CXX static library src/wallet/libwallet-tool.a
[388/509] Linking CXX executable src/bitcoin-wallet
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang failed with exit code 1

Tail of the build log:

[309/456] Building CXX object src/CMakeFiles/server.dir/pow/grasberg.cpp.o
[310/456] Building CXX object src/CMakeFiles/server.dir/node/transaction.cpp.o
[311/456] Building CXX object src/CMakeFiles/server.dir/pow/pow.cpp.o
[312/456] Building CXX object src/CMakeFiles/server.dir/rpc/abc.cpp.o
[313/456] Building CXX object src/CMakeFiles/server.dir/net.cpp.o
[314/456] Building CXX object src/CMakeFiles/server.dir/shutdown.cpp.o
[315/456] Building CXX object src/CMakeFiles/server.dir/node/ui_interface.cpp.o
[316/456] Building CXX object src/CMakeFiles/server.dir/script/scriptcache.cpp.o
[317/456] Building CXX object src/CMakeFiles/server.dir/rest.cpp.o
[318/456] Building CXX object src/CMakeFiles/server.dir/timedata.cpp.o
[319/456] Building CXX object src/CMakeFiles/server.dir/script/sigcache.cpp.o
[320/456] Building CXX object src/CMakeFiles/server.dir/rpc/misc.cpp.o
[321/456] Building CXX object src/CMakeFiles/server.dir/rpc/avalanche.cpp.o
[322/456] Building CXX object src/CMakeFiles/server.dir/txdb.cpp.o
[323/456] Building CXX object src/CMakeFiles/server.dir/versionbits.cpp.o
[324/456] Building CXX object src/CMakeFiles/server.dir/rpc/server.cpp.o
[325/456] Building C object src/secp256k1/CMakeFiles/sign-bench.dir/src/bench_sign.c.o
[326/456] Building C object src/secp256k1/CMakeFiles/verify-bench.dir/src/bench_verify.c.o
[327/456] Building C object src/secp256k1/CMakeFiles/recover-bench.dir/src/bench_recover.c.o
[328/456] Building CXX object src/CMakeFiles/server.dir/rpc/net.cpp.o
[329/456] Building CXX object src/CMakeFiles/server.dir/init.cpp.o
[330/456] Building CXX object src/CMakeFiles/server.dir/dummywallet.cpp.o
[331/456] Building CXX object src/CMakeFiles/server.dir/rpc/mining.cpp.o
[332/456] Building C object src/secp256k1/CMakeFiles/ecmult-bench.dir/src/bench_ecmult.c.o
[333/456] Building C object src/secp256k1/CMakeFiles/internal-bench.dir/src/bench_internal.c.o
[334/456] Building CXX object src/CMakeFiles/server.dir/validationinterface.cpp.o
[335/456] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[336/456] Building C object src/secp256k1/CMakeFiles/secp256k1.dir/src/secp256k1.c.o
[337/456] Linking C static library src/secp256k1/libsecp256k1.a
[338/456] Linking CXX static library src/libcommon.a
[339/456] Linking CXX static library src/libscript.a
[340/456] Linking CXX static library src/libbitcoinconsensus.a
[341/456] Linking CXX shared library src/libbitcoinconsensus.so.0.24.2
[342/456] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[343/456] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[344/456] Linking CXX executable src/bitcoin-cli
[345/456] Linking C executable src/secp256k1/ecmult-bench
[346/456] Linking C executable src/secp256k1/internal-bench
[347/456] Linking C executable src/secp256k1/sign-bench
[348/456] Linking C executable src/secp256k1/verify-bench
[349/456] Linking C executable src/secp256k1/recover-bench
[350/456] Linking CXX executable src/bitcoin-tx
[351/456] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[352/456] Building CXX object src/CMakeFiles/server.dir/torcontrol.cpp.o
[353/456] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[354/456] Building CXX object src/CMakeFiles/server.dir/net_processing.cpp.o
[355/456] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[356/456] Building CXX object src/CMakeFiles/server.dir/txmempool.cpp.o
[357/456] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/dns.cpp.o
[358/456] Building CXX object src/test/CMakeFiles/testutil.dir/util/net.cpp.o
[359/456] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[360/456] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/db.cpp.o
[361/456] Building CXX object src/CMakeFiles/server.dir/rpc/rawtransaction.cpp.o
[362/456] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[363/456] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[364/456] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/bitcoin.cpp.o
[365/456] Building CXX object src/CMakeFiles/server.dir/rpc/blockchain.cpp.o
[366/456] Building CXX object src/CMakeFiles/server.dir/validation.cpp.o
ninja: build stopped: cannot make progress due to previous errors.
Build build-without-wallet failed with exit code 1

Tail of the build log:

-- 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
[338/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[339/509] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/consensus/tx_check.cpp.o
[340/509] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/primitives/transaction.cpp.o
[341/509] Linking CXX static library src/libbitcoinconsensus.a
[342/509] Building CXX object src/CMakeFiles/script.dir/script/sign.cpp.o
[343/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[344/509] Building CXX object src/CMakeFiles/common.dir/rpc/util.cpp.o
[345/509] Building CXX object src/CMakeFiles/server.dir/rpc/rawtransaction.cpp.o
[346/509] Building CXX object src/CMakeFiles/server.dir/rpc/blockchain.cpp.o
[347/509] Building CXX object src/CMakeFiles/bitcoin-wallet.dir/bitcoin-wallet.cpp.o
[348/509] Building CXX object src/CMakeFiles/script.dir/script/signingprovider.cpp.o
[349/509] Building CXX object src/CMakeFiles/server.dir/validation.cpp.o
[350/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[351/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/context.cpp.o
[352/509] Building CXX object src/CMakeFiles/script.dir/script/descriptor.cpp.o
[353/509] Linking CXX static library src/libscript.a
[354/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[355/509] Linking CXX static library src/libcommon.a
[356/509] Building CXX object src/CMakeFiles/bitcoin-cli.dir/bitcoin-cli.cpp.o
[357/509] Linking CXX shared library src/libbitcoinconsensus.so.0.24.2
[358/509] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[359/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[360/509] Linking CXX executable src/bitcoin-cli
[361/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/net.cpp.o
[362/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
[363/509] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[364/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[365/509] Linking CXX executable src/bitcoin-tx
[366/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[367/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[368/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/bdb.cpp.o
[369/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[370/509] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[371/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/dns.cpp.o
[372/509] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[373/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[374/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/db.cpp.o
[375/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[376/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[377/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[378/509] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/bitcoin.cpp.o
[379/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/salvage.cpp.o
[380/509] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[381/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[382/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[383/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[384/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[385/509] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
[386/509] Linking CXX static library src/wallet/libwallet.a
[387/509] Linking CXX static library src/wallet/libwallet-tool.a
[388/509] Linking CXX executable src/bitcoin-wallet
ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1
Fabien planned changes to this revision.Thu, Sep 9, 11:25

Tail of the build log:

[330/507] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/hash.cpp.o
[331/507] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/uint256.cpp.o
[332/507] Building CXX object src/CMakeFiles/util.dir/util/error.cpp.o
[333/507] Building CXX object src/CMakeFiles/util.dir/util/settings.cpp.o
[334/507] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/primitives/transaction.cpp.o
[335/507] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/util/strencodings.cpp.o
[336/507] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/pubkey.cpp.o
[337/507] Building CXX object src/CMakeFiles/util.dir/util/message.cpp.o
[338/507] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/consensus/tx_check.cpp.o
[339/507] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[340/507] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[341/507] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[342/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/context.cpp.o
[343/507] Building CXX object src/CMakeFiles/util.dir/util/time.cpp.o
[344/507] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[345/507] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[346/507] Building CXX object src/CMakeFiles/util.dir/util/system.cpp.o
[347/507] Linking CXX static library src/libutil.a
[348/507] Linking CXX static library src/librpcclient.a
[349/507] Linking CXX static library src/libbitcoinconsensus.a
[350/507] Linking CXX static library src/libscript.a
[351/507] Linking CXX static library src/libcommon.a
[352/507] Linking CXX shared library src/libbitcoinconsensus.so.0.24.2
[353/507] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[354/507] Linking CXX executable src/bitcoin-cli
[355/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[356/507] Linking CXX executable src/bitcoin-tx
[357/507] Building CXX object src/test/CMakeFiles/testutil.dir/util/net.cpp.o
[358/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[359/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
[360/507] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[361/507] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[362/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[363/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/bdb.cpp.o
[364/507] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqabstractnotifier.cpp.o
[365/507] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[366/507] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[367/507] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqnotificationinterface.cpp.o
[368/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[369/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[370/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[371/507] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqpublishnotifier.cpp.o
[372/507] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/dns.cpp.o
[373/507] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/db.cpp.o
[374/507] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqrpc.cpp.o
[375/507] Linking CXX static library src/zmq/libzmq.a
[376/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[377/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/salvage.cpp.o
[378/507] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/bitcoin.cpp.o
[379/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[380/507] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[381/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[382/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[383/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
[384/507] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[385/507] Linking CXX static library src/wallet/libwallet.a
[386/507] Linking CXX static library src/wallet/libwallet-tool.a
[387/507] Linking CXX executable src/bitcoin-wallet
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang-tidy failed with exit code 1

Fix bad rebase and remove commented code line.

This revision is now accepted and ready to land.Thu, Sep 9, 11:55