This moves CWallet members and methods dealing with keys to a new LegacyScriptPubKeyMan class, and updates calling code to reference the new class instead of CWallet. Most of the changes are simple text replacements and variable substitutions easily verified with: git log -p -n1 -U0 --word-diff-regex=. The only nontrivial chunk of code added is the new LegacyScriptPubKeyMan class declaration, but this code isn't new and is just selectively copied and moved from the previous CWallet class declaration. This can be verified with: git log -p -n1 --color-moved=dimmed_zebra src/wallet/scriptpubkeyman.h src/wallet/wallet.h or git diff HEAD~1:src/wallet/wallet.h HEAD:src/wallet/scriptpubkeyman.h This commit does not change behavior.
28 lines
889 B
Bash
Executable file
28 lines
889 B
Bash
Executable file
#!/usr/bin/env bash
|
|
#
|
|
# Copyright (c) 2018 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
#
|
|
# Check that all logs are terminated with '\n'
|
|
#
|
|
# Some logs are continued over multiple lines. They should be explicitly
|
|
# commented with \* Continued *\
|
|
#
|
|
# There are some instances of LogPrintf() in comments. Those can be
|
|
# ignored
|
|
|
|
export LC_ALL=C
|
|
UNTERMINATED_LOGS=$(git grep --extended-regexp "LogPrintf?\(" -- "*.cpp" | \
|
|
grep -v '\\n"' | \
|
|
grep -v '\.\.\.' | \
|
|
grep -v "/\* Continued \*/" | \
|
|
grep -v "LogPrint()" | \
|
|
grep -v "LogPrintf()")
|
|
if [[ ${UNTERMINATED_LOGS} != "" ]]; then
|
|
# shellcheck disable=SC2028
|
|
echo "All calls to LogPrintf() and LogPrint() should be terminated with \\n"
|
|
echo
|
|
echo "${UNTERMINATED_LOGS}"
|
|
exit 1
|
|
fi
|