mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-29 18:20:58 +02:00
refactor: cleanups post unsubtree'ing univalue
Mostly changes to remove src/univalue exceptions from the various linters, and the required code changes to make them happy. As well as minor doc changes.
This commit is contained in:
@ -28,7 +28,6 @@ To do a full check with `-r`, make sure that you have fetched the upstream repos
|
||||
maintained:
|
||||
* for `src/secp256k1`: https://github.com/bitcoin-core/secp256k1.git (branch master)
|
||||
* for `src/leveldb`: https://github.com/bitcoin-core/leveldb-subtree.git (branch bitcoin-fork)
|
||||
* for `src/univalue`: https://github.com/bitcoin-core/univalue-subtree.git (branch master)
|
||||
* for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master)
|
||||
* for `src/crc32c`: https://github.com/bitcoin-core/crc32c-subtree.git (branch bitcoin-fork)
|
||||
* for `src/minisketch`: https://github.com/sipa/minisketch.git (branch master)
|
||||
|
@ -21,7 +21,7 @@ ALL_SOURCE_FILENAMES_REGEXP = r"^.*\.(cpp|h|py|sh)$"
|
||||
ALLOWED_FILENAME_REGEXP = "^[a-zA-Z0-9/_.@][a-zA-Z0-9/_.@-]*$"
|
||||
ALLOWED_SOURCE_FILENAME_REGEXP = "^[a-z0-9_./-]+$"
|
||||
ALLOWED_SOURCE_FILENAME_EXCEPTION_REGEXP = (
|
||||
"^src/(secp256k1/|minisketch/|univalue/|test/fuzz/FuzzedDataProvider.h)"
|
||||
"^src/(secp256k1/|minisketch/|test/fuzz/FuzzedDataProvider.h)"
|
||||
)
|
||||
ALLOWED_PERMISSION_NON_EXECUTABLES = 0o644
|
||||
ALLOWED_PERMISSION_EXECUTABLES = 0o755
|
||||
|
@ -77,7 +77,7 @@ def main():
|
||||
|
||||
matching_files_filtered = []
|
||||
for matching_file in matching_files:
|
||||
if not re.search('^src/(leveldb|secp256k1|minisketch|tinyformat|univalue|test/fuzz/strprintf.cpp)', matching_file):
|
||||
if not re.search('^src/(leveldb|secp256k1|minisketch|tinyformat|test/fuzz/strprintf.cpp)', matching_file):
|
||||
matching_files_filtered.append(matching_file)
|
||||
matching_files_filtered.sort()
|
||||
|
||||
|
@ -22,7 +22,6 @@ EXCLUDE_FILES_WITH_PREFIX = ['src/crypto/ctaes',
|
||||
'src/crc32c',
|
||||
'src/secp256k1',
|
||||
'src/minisketch',
|
||||
'src/univalue',
|
||||
'src/tinyformat.h',
|
||||
'src/bench/nanobench.h',
|
||||
'src/test/fuzz/FuzzedDataProvider.h']
|
||||
|
@ -19,7 +19,7 @@ EXCLUDED_DIRS = ["src/leveldb/",
|
||||
"src/crc32c/",
|
||||
"src/secp256k1/",
|
||||
"src/minisketch/",
|
||||
"src/univalue/"]
|
||||
]
|
||||
|
||||
EXPECTED_BOOST_INCLUDES = ["boost/algorithm/string/replace.hpp",
|
||||
"boost/date_time/posix_time/posix_time.hpp",
|
||||
|
@ -60,7 +60,6 @@ REGEXP_EXTERNAL_DEPENDENCIES_EXCLUSIONS = [
|
||||
"src/secp256k1/",
|
||||
"src/minisketch/",
|
||||
"src/tinyformat.h",
|
||||
"src/univalue/"
|
||||
]
|
||||
|
||||
LOCALE_DEPENDENT_FUNCTIONS = [
|
||||
|
@ -41,7 +41,7 @@ def main():
|
||||
exit_code = 0
|
||||
shell_files = get_shell_files_list()
|
||||
for file_path in shell_files:
|
||||
if re.search('src/(secp256k1|minisketch|univalue)/', file_path):
|
||||
if re.search('src/(secp256k1|minisketch)/', file_path):
|
||||
continue
|
||||
|
||||
with open(file_path, 'r', encoding='utf-8') as file_obj:
|
||||
|
@ -68,7 +68,7 @@ def main():
|
||||
]
|
||||
files = get_files(files_cmd)
|
||||
# remove everything that doesn't match this regex
|
||||
reg = re.compile(r'src/[leveldb,secp256k1,minisketch,univalue]')
|
||||
reg = re.compile(r'src/[leveldb,secp256k1,minisketch]')
|
||||
files[:] = [file for file in files if not reg.match(file)]
|
||||
|
||||
# build the `shellcheck` command
|
||||
|
@ -12,7 +12,7 @@ Note: Will exit successfully regardless of spelling errors.
|
||||
from subprocess import check_output, STDOUT, CalledProcessError
|
||||
|
||||
IGNORE_WORDS_FILE = 'test/lint/spelling.ignore-words.txt'
|
||||
FILES_ARGS = ['git', 'ls-files', '--', ":(exclude)build-aux/m4/", ":(exclude)contrib/seeds/*.txt", ":(exclude)depends/", ":(exclude)doc/release-notes/", ":(exclude)src/leveldb/", ":(exclude)src/crc32c/", ":(exclude)src/qt/locale/", ":(exclude)src/qt/*.qrc", ":(exclude)src/secp256k1/", ":(exclude)src/minisketch/", ":(exclude)src/univalue/", ":(exclude)contrib/builder-keys/keys.txt", ":(exclude)contrib/guix/patches"]
|
||||
FILES_ARGS = ['git', 'ls-files', '--', ":(exclude)build-aux/m4/", ":(exclude)contrib/seeds/*.txt", ":(exclude)depends/", ":(exclude)doc/release-notes/", ":(exclude)src/leveldb/", ":(exclude)src/crc32c/", ":(exclude)src/qt/locale/", ":(exclude)src/qt/*.qrc", ":(exclude)src/secp256k1/", ":(exclude)src/minisketch/", ":(exclude)contrib/builder-keys/keys.txt", ":(exclude)contrib/guix/patches"]
|
||||
|
||||
|
||||
def check_codespell_install():
|
||||
|
@ -22,7 +22,6 @@ EXCLUDED_DIRS = ["depends/patches/",
|
||||
"src/crc32c/",
|
||||
"src/secp256k1/",
|
||||
"src/minisketch/",
|
||||
"src/univalue/",
|
||||
"doc/release-notes/",
|
||||
"src/qt/locale"]
|
||||
|
||||
|
Reference in New Issue
Block a user