diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index 20464c3aea..2ea6502192 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -136,7 +136,7 @@ bash -c "${BASE_ROOT_DIR}/configure --cache-file=config.cache $BITCOIN_CONFIG_AL make distdir VERSION="$HOST" -cd "${BASE_BUILD_DIR}/bitcoin-$HOST" +cd "${BASE_BUILD_DIR}/blackcoin-$HOST" bash -c "./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false) @@ -180,7 +180,7 @@ if [ "${RUN_TIDY}" = "true" ]; then cmake --build /tidy-build --target bitcoin-tidy-tests "$MAKEJOBS" set -eo pipefail - cd "${BASE_BUILD_DIR}/bitcoin-$HOST/src/" + cd "${BASE_BUILD_DIR}/blackcoin-$HOST/src/" ( run-clang-tidy-"${TIDY_LLVM_V}" -quiet -load="/tidy-build/libbitcoin-tidy.so" "${MAKEJOBS}" ) | grep -C5 "error" # Filter out files by regex here, because regex may not be # accepted in src/.bear-tidy-config @@ -188,10 +188,10 @@ if [ "${RUN_TIDY}" = "true" ]; then # * qt qrc and moc generated files jq 'map(select(.file | test("src/qt/qrc_.*\\.cpp$|/moc_.*\\.cpp$") | not))' ../compile_commands.json > tmp.json mv tmp.json ../compile_commands.json - cd "${BASE_BUILD_DIR}/bitcoin-$HOST/" + cd "${BASE_BUILD_DIR}/blackcoin-$HOST/" python3 "/include-what-you-use/iwyu_tool.py" \ -p . "${MAKEJOBS}" \ - -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" \ + -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/blackcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" \ -Xiwyu --max_line_length=160 \ 2>&1 | tee /tmp/iwyu_ci.out cd "${BASE_ROOT_DIR}/src" diff --git a/src/Makefile.am b/src/Makefile.am index 8a9df70465..978bad0d40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -244,6 +244,7 @@ BITCOIN_CORE_H = \ policy/packages.h \ policy/policy.h \ policy/settings.h \ + pos.h \ pow.h \ prevector.h \ primitives/block.h \ @@ -660,7 +661,8 @@ libbitcoin_consensus_a_SOURCES = \ script/script_error.h \ serialize.h \ span.h \ - timedatadummy.cpp \ + timedata.cpp \ + timedata.h \ tinyformat.h \ uint256.cpp \ uint256.h \ @@ -858,8 +860,11 @@ blackmore_tx_LDADD = \ # # blackmore-wallet binary # -blackmore_wallet_SOURCES = bitcoin-wallet.cpp -blackmore_wallet_SOURCES += init/bitcoin-wallet.cpp +blackmore_wallet_SOURCES = \ + bitcoin-wallet.cpp \ + timedatadummy.cpp \ + consensus/tx_verify.cpp \ + init/bitcoin-wallet.cpp blackmore_wallet_CPPFLAGS = $(blackmore_bin_cppflags) blackmore_wallet_CXXFLAGS = $(blackmore_bin_cxxflags) blackmore_wallet_LDFLAGS = $(blackmore_bin_ldflags) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index d575b04b7f..0c38357979 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1646,7 +1646,6 @@ bool PeerManagerImpl::ProcessNetBlockHeaders(CNode& pfrom, const std::vector pblock, bool force_processing, bool min_pow_checked, bool* new_block, CNode& pfrom) { PeerRef peer = GetPeerRef(pfrom.GetId()); - uint256 hash; { LOCK(cs_main); diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index e00691837b..aa5ea7d2bf 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -9,6 +9,7 @@ #include #include