Differential D7716
[backport#13136] Fix flake8 warnings in several wallet functional tests Authored by majcosta on Oct 1 2020, 16:22.
Details
Note: This backport apparently was skipped due to being (mostly) irrelevant changes that our linter takes care of anyway. But there was one line of code changed on wallet_basic and a few variable name changes that are being a pain, so I'm bringing in the relevant parts. Backport of Core PR13136 (hiding whitespace changes makes this easier) ninja all check check-functional
Diff Detail
Event TimelineComment Actions [Bot Message] Comment Actions Build Bitcoin ABC Diffs / Diff Testing (build-clang-tidy) failed.
Snippet of first build failure: [319/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[320/482] Building C object src/secp256k1/CMakeFiles/secp256k1.dir/src/secp256k1.c.o
[321/482] Linking C static library src/secp256k1/libsecp256k1.a
[322/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[323/482] Linking C executable src/secp256k1/ecmult-bench
[324/482] Linking CXX static library src/libscript.a
[325/482] Linking C executable src/secp256k1/internal-bench
[326/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[327/482] Linking C executable src/secp256k1/sign-bench
[328/482] Linking C executable src/secp256k1/verify-bench
[329/482] Linking C executable src/secp256k1/recover-bench
[330/482] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[331/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[332/482] Building CXX object src/CMakeFiles/server.dir/init.cpp.o
[333/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[334/482] Building CXX object src/CMakeFiles/common.dir/rpc/rawtransaction_util.cpp.o
[335/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[336/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[337/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[338/482] Building CXX object src/CMakeFiles/common.dir/rpc/util.cpp.o
[339/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[340/482] Linking CXX static library src/libcommon.a
[341/482] Linking CXX executable src/bitcoin-cli
[342/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[343/482] Linking CXX static library src/libbitcoinconsensus.a
[344/482] Linking CXX shared library src/libbitcoinconsensus.so.0.22.4
[345/482] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[346/482] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[347/482] Linking CXX executable src/bitcoin-tx
[348/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
FAILED: src/wallet/CMakeFiles/wallet.dir/db.cpp.o
/usr/bin/cmake -E __run_co_compile --launcher=/usr/bin/ccache --tidy="/usr/bin/clang-tidy-8;-warnings-as-errors=*" --source=../../src/wallet/db.cpp -- /usr/bin/clang++ -DBOOST_AC_USE_STD_ATOMIC -DBOOST_SP_USE_STD_ATOMIC -DBUILD_BITCOIN_INTERNAL -DENABLE_AVX2 -DENABLE_SHANI -DENABLE_SSE41 -DHAVE_BUILD_INFO -DHAVE_CONFIG_H -DHAVE_CONSENSUS_LIB -I../../src/. -Isrc -I../../src/univalue/include -Isrc/crypto/.. -I../../src/secp256k1/include -isystem /usr/include/jemalloc -g -O2 -fPIC -fvisibility=hidden -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wvla -Wcast-align -Wunused-parameter -Wmissing-braces -Wthread-safety-analysis -Wshadow -Wshadow-field -Wrange-loop-analysis -Wredundant-decls -Wformat-security -Wredundant-move -Wno-unused-parameter -Wno-implicit-fallthrough -pthread -std=gnu++14 -MD -MT src/wallet/CMakeFiles/wallet.dir/db.cpp.o -MF src/wallet/CMakeFiles/wallet.dir/db.cpp.o.d -o src/wallet/CMakeFiles/wallet.dir/db.cpp.o -c ../../src/wallet/db.cpp
/work/abc-ci-builds/build-clang-tidy/../../src/wallet/db.cpp:869:30: error: statement should be inside braces [readability-braces-around-statements,-warnings-as-errors]
if (!fMockDb) dbenv->lsn_reset(strFile.c_str(), 0);
^
{
2458 warnings generated.
Suppressed 2457 warnings (2457 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
1 warning treated as error
[349/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[350/482] Building CXX object src/CMakeFiles/server.dir/rpc/blockchain.cpp.o
[351/482] Building CXX object src/seeder/CMakeFiles/seeder.dir/dns.cpp.o
[352/482] Building CXX object src/seeder/CMakeFiles/seeder.dir/bitcoin.cpp.o
[353/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[354/482] Building CXX object src/seeder/CMakeFiles/seeder.dir/db.cpp.o
[355/482] Linking CXX static library src/seeder/libseeder.a
[356/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[357/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[358/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/psbtwallet.cpp.o
[359/482] Building CXX object src/CMakeFiles/server.dir/rpc/rawtransaction.cpp.o
[360/482] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[361/482] Linking CXX executable src/seeder/bitcoin-seeder
[362/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[363/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[364/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[365/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[366/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang-tidy failed with exit code 1
| ||||||||||||||||||||